zefie/llvm-mingw
1
0 Fork 0
Code Activity

Quote uses of $PREFIX in the build script, to improve support for installing into a path that contains spaces

Browse Source 
For build-mingw-w64.sh to succeed when installing to such a path,
the mingw-w64 version has to be updated to the latest git master.

build-mingw-w64-libraries.sh still fails in this case, as libtool
fails to properly quote $LD in a test for whether the linker is GNU ld.
This commit is contained in:
Martin Storsjö committed 2019-12-03 21:49:53 +02:00
1 parent ee555b9013
commit 64d39428b6
7 files changed
+49 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build-mingw-w64.sh
+9 -9
View File
@@ -65,23 +65,23 @@ fi
# runtime and don't need to rebuild it.
if [ -z "$HOST" ]; then
if [ -z "$SKIP_INCLUDE_TRIPLET_PREFIX" ]; then
HEADER_ROOT=$PREFIX/generic-w64-mingw32
HEADER_ROOT="$PREFIX/generic-w64-mingw32"
else
HEADER_ROOT=$PREFIX
HEADER_ROOT="$PREFIX"
fi
cd mingw-w64-headers
mkdir -p build
cd build
../configure --prefix=$HEADER_ROOT \
../configure --prefix="$HEADER_ROOT" \
--enable-idl --with-default-win32-winnt=$DEFAULT_WIN32_WINNT --with-default-msvcrt=$DEFAULT_MSVCRT INSTALL="install -C"
make install
cd ../..
if [ -z "$SKIP_INCLUDE_TRIPLET_PREFIX" ]; then
for arch in $ARCHS; do
mkdir -p $PREFIX/$arch-w64-mingw32
if [ ! -e $PREFIX/$arch-w64-mingw32/include ]; then
ln -sfn ../generic-w64-mingw32/include $PREFIX/$arch-w64-mingw32/include
mkdir -p "$PREFIX/$arch-w64-mingw32"
if [ ! -e "$PREFIX/$arch-w64-mingw32/include" ]; then
ln -sfn ../generic-w64-mingw32/include "$PREFIX/$arch-w64-mingw32/include"
fi
done
fi
@@ -105,7 +105,7 @@ if [ -z "$HOST" ]; then
;;
esac
FLAGS="$FLAGS --with-default-msvcrt=$DEFAULT_MSVCRT"
../configure --host=$arch-w64-mingw32 --prefix=$PREFIX/$arch-w64-mingw32 $FLAGS
../configure --host=$arch-w64-mingw32 --prefix="$PREFIX/$arch-w64-mingw32" $FLAGS
make -j$CORES
make install
cd ..
@@ -142,12 +142,12 @@ cd mingw-w64-tools/widl
for arch in $ARCHS; do
mkdir -p build-$CROSS_NAME$arch
cd build-$CROSS_NAME$arch
../configure --prefix=$PREFIX --target=$arch-w64-mingw32 $CONFIGFLAGS LDFLAGS="-Wl,-s"
../configure --prefix="$PREFIX" --target=$arch-w64-mingw32 $CONFIGFLAGS LDFLAGS="-Wl,-s"
make -j$CORES
make install
cd ..
done
cd $PREFIX/bin
cd "$PREFIX/bin"
if [ -n "$SKIP_INCLUDE_TRIPLET_PREFIX" ]; then
for arch in $ALL_ARCHS; do
if [ "$arch" != "$ARCHS" ]; then