aboutsummaryrefslogtreecommitdiff
path: root/windows/build.bash
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2010-10-09 12:27:08 +0300
committerLasse Collin <lasse.collin@tukaani.org>2010-10-09 12:27:08 +0300
commit71275457ca24c9b01721f5cfc3638cf094daf454 (patch)
tree7a352a6b265f23ab1f93693a00791fde6e5c65e3 /windows/build.bash
parentWindows: Copy COPYING-Windows.txt (if it exists) to the package. (diff)
downloadxz-71275457ca24c9b01721f5cfc3638cf094daf454.tar.xz
Windows: Make build.bash prefer MinGW-w32 over MinGW.
This is simply for licensing reasons. The 64-bit version will be built with MinGW-w64 anyway (at least for now), so using it also for 32-bit build allows using the same copyright notice about the MinGW-w64/w32 runtime. Note that using MinGW would require a copyright notice too, because its runtime is not in the public domain either even though MinGW's home page claims that it is public domain. See <http://marc.info/?l=mingw-users&m=126489506214078>.
Diffstat (limited to 'windows/build.bash')
-rw-r--r--windows/build.bash18
1 files changed, 9 insertions, 9 deletions
diff --git a/windows/build.bash b/windows/build.bash
index af7921d4..a45d33c3 100644
--- a/windows/build.bash
+++ b/windows/build.bash
@@ -5,7 +5,7 @@
# Build a binary package on Windows with MinGW and MSYS
#
# Set the paths where MinGW, Mingw-w32, or MinGW-w64 are installed. If both
-# MinGW and MinGW-w32 are specified, MinGW will be used. If there is no
+# MinGW and MinGW-w32 are specified, MinGW-w32 will be used. If there is no
# 32-bit or 64-bit compiler at all, it is simply skipped.
#
# Optionally, 7-Zip is used to create the final .zip and .7z packages.
@@ -134,20 +134,20 @@ txtcp()
# support even Win95.
#
# FIXME: Using i486 in the configure triplet may be wrong.
-if [ -d "$MINGW_DIR" ]; then
- # 32-bit x86, Win95 or later, using MinGW
- PATH=$MINGW_DIR/bin:$PATH \
- buildit \
- pkg/bin_i486 \
- i486-pc-mingw32 \
- '-march=i486 -mtune=generic'
-elif [ -d "$MINGW_W32_DIR" ]; then
+if [ -d "$MINGW_W32_DIR" ]; then
# 32-bit x86, Win95 or later, using MinGW-w32
PATH=$MINGW_W32_DIR/bin:$MINGW_W32_DIR/i686-w64-mingw32/bin:$PATH \
buildit \
pkg/bin_i486 \
i486-w64-mingw32 \
'-march=i486 -mtune=generic'
+elif [ -d "$MINGW_DIR" ]; then
+ # 32-bit x86, Win95 or later, using MinGW
+ PATH=$MINGW_DIR/bin:$PATH \
+ buildit \
+ pkg/bin_i486 \
+ i486-pc-mingw32 \
+ '-march=i486 -mtune=generic'
fi
if [ -d "$MINGW_W64_DIR" ]; then