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>.
This commit is contained in:
parent
3ac35719d8
commit
71275457ca
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue