From 64d39428b6672d8c84e6ca85baf07f5e066ccf27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Tue, 3 Dec 2019 21:49:53 +0200
Subject: [PATCH] Quote uses of $PREFIX in the build script, to improve support
 for installing into a path that contains spaces

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.
---
 build-compiler-rt.sh             | 20 ++++++++++----------
 build-libcxx.sh                  | 32 ++++++++++++++++----------------
 build-libssp.sh                  | 10 +++++-----
 build-mingw-w64-libraries.sh     |  2 +-
 build-mingw-w64.sh               | 18 +++++++++---------
 install-wrappers.sh              | 14 +++++++-------
 wrappers/clang-target-wrapper.sh |  2 +-
 7 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/build-compiler-rt.sh b/build-compiler-rt.sh
index aaac17e..d1e4b81 100755
--- a/build-compiler-rt.sh
+++ b/build-compiler-rt.sh
@@ -29,7 +29,7 @@ export PATH="$PREFIX/bin:$PATH"
 : ${CORES:=4}
 : ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
 
-CLANG_VERSION=$(basename $(dirname $(dirname $(dirname $($PREFIX/bin/clang --print-libgcc-file-name -rtlib=compiler-rt)))))
+CLANG_VERSION=$(basename "$(dirname "$(dirname "$(dirname "$("$PREFIX/bin/clang" --print-libgcc-file-name -rtlib=compiler-rt)")")")")
 
 if [ ! -d llvm-project/compiler-rt ] || [ -n "$SYNC" ]; then
     CHECKOUT_ONLY=1 ./build-llvm.sh
@@ -38,8 +38,8 @@ fi
 # Add a symlink for i386 -> i686; we normally name the toolchain
 # i686-w64-mingw32, but due to the compiler-rt cmake peculiarities, we
 # need to refer to it as i386 at this stage.
-if [ ! -e $PREFIX/i386-w64-mingw32 ]; then
-    ln -sfn i686-w64-mingw32 $PREFIX/i386-w64-mingw32 || true
+if [ ! -e "$PREFIX/i386-w64-mingw32" ]; then
+    ln -sfn i686-w64-mingw32 "$PREFIX/i386-w64-mingw32" || true
 fi
 
 cd llvm-project/compiler-rt
@@ -80,12 +80,12 @@ for arch in $ARCHS; do
     cmake \
         ${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=$PREFIX/$arch-w64-mingw32 \
+        -DCMAKE_INSTALL_PREFIX="$PREFIX/$arch-w64-mingw32" \
         -DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \
         -DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \
         -DCMAKE_SYSTEM_NAME=Windows \
-        -DCMAKE_AR=$PREFIX/bin/llvm-ar \
-        -DCMAKE_RANLIB=$PREFIX/bin/llvm-ranlib \
+        -DCMAKE_AR="$PREFIX/bin/llvm-ar" \
+        -DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
         -DCMAKE_C_COMPILER_WORKS=1 \
         -DCMAKE_CXX_COMPILER_WORKS=1 \
         -DCMAKE_C_COMPILER_TARGET=$buildarchname-windows-gnu \
@@ -93,14 +93,14 @@ for arch in $ARCHS; do
         -DCOMPILER_RT_USE_BUILTINS_LIBRARY=TRUE \
         $SRC_DIR
     make -j$CORES
-    mkdir -p $PREFIX/lib/clang/$CLANG_VERSION/lib/windows
-    mkdir -p $PREFIX/$arch-w64-mingw32/bin
+    mkdir -p "$PREFIX/lib/clang/$CLANG_VERSION/lib/windows"
+    mkdir -p "$PREFIX/$arch-w64-mingw32/bin"
     for i in lib/windows/libclang_rt.*-$buildarchname*.a; do
-        cp $i $PREFIX/lib/clang/$CLANG_VERSION/lib/windows/$(basename $i | sed s/$buildarchname/$libarchname/)
+        cp $i "$PREFIX/lib/clang/$CLANG_VERSION/lib/windows/$(basename $i | sed s/$buildarchname/$libarchname/)"
     done
     for i in lib/windows/libclang_rt.*-$buildarchname*.dll; do
         if [ -f $i ]; then
-            cp $i $PREFIX/$arch-w64-mingw32/bin
+            cp $i "$PREFIX/$arch-w64-mingw32/bin"
         fi
     done
     if [ -n "$SANITIZERS" ]; then
diff --git a/build-libcxx.sh b/build-libcxx.sh
index 877d412..49b372f 100755
--- a/build-libcxx.sh
+++ b/build-libcxx.sh
@@ -71,7 +71,7 @@ build_all() {
         cmake \
             ${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
             -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX=$PREFIX/$arch-w64-mingw32 \
+            -DCMAKE_INSTALL_PREFIX="$PREFIX/$arch-w64-mingw32" \
             -DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \
             -DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \
             -DCMAKE_CROSSCOMPILING=TRUE \
@@ -79,8 +79,8 @@ build_all() {
             -DCMAKE_C_COMPILER_WORKS=TRUE \
             -DCMAKE_CXX_COMPILER_WORKS=TRUE \
             -DLLVM_COMPILER_CHECKED=TRUE \
-            -DCMAKE_AR=$PREFIX/bin/llvm-ar \
-            -DCMAKE_RANLIB=$PREFIX/bin/llvm-ranlib \
+            -DCMAKE_AR="$PREFIX/bin/llvm-ar" \
+            -DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
             -DCXX_SUPPORTS_CXX11=TRUE \
             -DCXX_SUPPORTS_CXX_STD=TRUE \
             -DLIBUNWIND_USE_COMPILER_RT=TRUE \
@@ -94,8 +94,8 @@ build_all() {
         make -j$CORES
         make install
         if [ "$type" = "shared" ]; then
-            mkdir -p $PREFIX/$arch-w64-mingw32/bin
-            cp lib/libunwind.dll $PREFIX/$arch-w64-mingw32/bin
+            mkdir -p "$PREFIX/$arch-w64-mingw32/bin"
+            cp lib/libunwind.dll "$PREFIX/$arch-w64-mingw32/bin"
         fi
         cd ..
     done
@@ -113,7 +113,7 @@ build_all() {
         cmake \
             ${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
             -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX=$PREFIX/$arch-w64-mingw32 \
+            -DCMAKE_INSTALL_PREFIX="$PREFIX/$arch-w64-mingw32" \
             -DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \
             -DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \
             -DCMAKE_CROSSCOMPILING=TRUE \
@@ -121,8 +121,8 @@ build_all() {
             -DCMAKE_C_COMPILER_WORKS=TRUE \
             -DCMAKE_CXX_COMPILER_WORKS=TRUE \
             -DLLVM_COMPILER_CHECKED=TRUE \
-            -DCMAKE_AR=$PREFIX/bin/llvm-ar \
-            -DCMAKE_RANLIB=$PREFIX/bin/llvm-ranlib \
+            -DCMAKE_AR="$PREFIX/bin/llvm-ar" \
+            -DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
             -DLIBCXXABI_USE_COMPILER_RT=ON \
             -DLIBCXXABI_ENABLE_EXCEPTIONS=ON \
             -DLIBCXXABI_ENABLE_THREADS=ON \
@@ -151,7 +151,7 @@ build_all() {
         cmake \
             ${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
             -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX=$PREFIX/$arch-w64-mingw32 \
+            -DCMAKE_INSTALL_PREFIX="$PREFIX/$arch-w64-mingw32" \
             -DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \
             -DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \
             -DCMAKE_CROSSCOMPILING=TRUE \
@@ -159,8 +159,8 @@ build_all() {
             -DCMAKE_C_COMPILER_WORKS=TRUE \
             -DCMAKE_CXX_COMPILER_WORKS=TRUE \
             -DLLVM_COMPILER_CHECKED=TRUE \
-            -DCMAKE_AR=$PREFIX/bin/llvm-ar \
-            -DCMAKE_RANLIB=$PREFIX/bin/llvm-ranlib \
+            -DCMAKE_AR="$PREFIX/bin/llvm-ar" \
+            -DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
             -DLIBCXX_USE_COMPILER_RT=ON \
             -DLIBCXX_INSTALL_HEADERS=ON \
             -DLIBCXX_ENABLE_EXCEPTIONS=ON \
@@ -187,13 +187,13 @@ build_all() {
         make install
         if [ "$type" = "shared" ]; then
             llvm-ar qcsL \
-                $PREFIX/$arch-w64-mingw32/lib/libc++.dll.a \
-                $PREFIX/$arch-w64-mingw32/lib/libunwind.dll.a
-            cp lib/libc++.dll $PREFIX/$arch-w64-mingw32/bin
+                "$PREFIX/$arch-w64-mingw32/lib/libc++.dll.a" \
+                "$PREFIX/$arch-w64-mingw32/lib/libunwind.dll.a"
+            cp lib/libc++.dll "$PREFIX/$arch-w64-mingw32/bin"
         else
             llvm-ar qcsL \
-                $PREFIX/$arch-w64-mingw32/lib/libc++.a \
-                $PREFIX/$arch-w64-mingw32/lib/libunwind.a
+                "$PREFIX/$arch-w64-mingw32/lib/libc++.a" \
+                "$PREFIX/$arch-w64-mingw32/lib/libunwind.a"
         fi
         cd ..
     done
diff --git a/build-libssp.sh b/build-libssp.sh
index e5e4c06..f96a90e 100755
--- a/build-libssp.sh
+++ b/build-libssp.sh
@@ -42,10 +42,10 @@ for arch in $ARCHS; do
     mkdir -p build-$arch
     cd build-$arch
     make -f ../Makefile -j$CORES CROSS=$arch-w64-mingw32-
-    mkdir -p $PREFIX/$arch-w64-mingw32/bin
-    cp libssp.a $PREFIX/$arch-w64-mingw32/lib
-    cp libssp_nonshared.a $PREFIX/$arch-w64-mingw32/lib
-    cp libssp.dll.a $PREFIX/$arch-w64-mingw32/lib
-    cp libssp-0.dll $PREFIX/$arch-w64-mingw32/bin
+    mkdir -p "$PREFIX/$arch-w64-mingw32/bin"
+    cp libssp.a "$PREFIX/$arch-w64-mingw32/lib"
+    cp libssp_nonshared.a "$PREFIX/$arch-w64-mingw32/lib"
+    cp libssp.dll.a "$PREFIX/$arch-w64-mingw32/lib"
+    cp libssp-0.dll "$PREFIX/$arch-w64-mingw32/bin"
     cd ..
 done
diff --git a/build-mingw-w64-libraries.sh b/build-mingw-w64-libraries.sh
index debda04..9842862 100755
--- a/build-mingw-w64-libraries.sh
+++ b/build-mingw-w64-libraries.sh
@@ -22,7 +22,7 @@ for lib in winpthreads winstorecompat; do
     for arch in $ARCHS; do
         mkdir -p build-$arch
         cd build-$arch
-        ../configure --host=$arch-w64-mingw32 --prefix=$PREFIX/$arch-w64-mingw32 --libdir=$PREFIX/$arch-w64-mingw32/lib
+        ../configure --host=$arch-w64-mingw32 --prefix="$PREFIX/$arch-w64-mingw32" --libdir="$PREFIX/$arch-w64-mingw32/lib"
         make -j$CORES
         make install
         cd ..
diff --git a/build-mingw-w64.sh b/build-mingw-w64.sh
index 4d3cbe2..38c8d8a 100755
--- a/build-mingw-w64.sh
+++ b/build-mingw-w64.sh
@@ -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
diff --git a/install-wrappers.sh b/install-wrappers.sh
index 7e3151b..fd91908 100755
--- a/install-wrappers.sh
+++ b/install-wrappers.sh
@@ -45,18 +45,18 @@ if [ -n "$EXEEXT" ]; then
     WRAPPER_FLAGS="$WRAPPER_FLAGS -municode -DCLANG=\"clang-$CLANG_MAJOR\""
 fi
 
-mkdir -p $PREFIX/bin
-cp wrappers/*-wrapper.sh $PREFIX/bin
+mkdir -p "$PREFIX/bin"
+cp wrappers/*-wrapper.sh "$PREFIX/bin"
 if [ -n "$HOST" ]; then
     # TODO: If building natively on msys, pick up the default HOST value from there.
     WRAPPER_FLAGS="$WRAPPER_FLAGS -DDEFAULT_TARGET=\"$HOST\""
     for i in wrappers/*-wrapper.sh; do
-        cat $i | sed 's/^DEFAULT_TARGET=.*/DEFAULT_TARGET='$HOST/ > $PREFIX/bin/$(basename $i)
+        cat $i | sed 's/^DEFAULT_TARGET=.*/DEFAULT_TARGET='$HOST/ > "$PREFIX/bin/$(basename $i)"
     done
 fi
-$CC wrappers/clang-target-wrapper.c -o $PREFIX/bin/clang-target-wrapper$EXEEXT -O2 -Wl,-s $WRAPPER_FLAGS
-$CC wrappers/windres-wrapper.c -o $PREFIX/bin/windres-wrapper$EXEEXT -O2 -Wl,-s $WRAPPER_FLAGS
-$CC wrappers/llvm-wrapper.c -o $PREFIX/bin/llvm-wrapper$EXEEXT -O2 -Wl,-s $WRAPPER_FLAGS
+$CC wrappers/clang-target-wrapper.c -o "$PREFIX/bin/clang-target-wrapper$EXEEXT" -O2 -Wl,-s $WRAPPER_FLAGS
+$CC wrappers/windres-wrapper.c -o "$PREFIX/bin/windres-wrapper$EXEEXT" -O2 -Wl,-s $WRAPPER_FLAGS
+$CC wrappers/llvm-wrapper.c -o "$PREFIX/bin/llvm-wrapper$EXEEXT" -O2 -Wl,-s $WRAPPER_FLAGS
 if [ -n "$EXEEXT" ]; then
     # For Windows, we should prefer the executable wrapper, which also works
     # when invoked from outside of MSYS.
@@ -65,7 +65,7 @@ if [ -n "$EXEEXT" ]; then
 else
     CTW_SUFFIX=.sh
 fi
-cd $PREFIX/bin
+cd "$PREFIX/bin"
 for arch in $ARCHS; do
     for target_os in $TARGET_OSES; do
         for exec in clang clang++ gcc g++ cc c99 c11 c++; do
diff --git a/wrappers/clang-target-wrapper.sh b/wrappers/clang-target-wrapper.sh
index f6b6ea9..be765ca 100755
--- a/wrappers/clang-target-wrapper.sh
+++ b/wrappers/clang-target-wrapper.sh
@@ -71,4 +71,4 @@ FLAGS="$FLAGS -fuse-ld=lld"
 FLAGS="$FLAGS -fuse-cxa-atexit"
 FLAGS="$FLAGS -Qunused-arguments"
 
-$CCACHE $CLANG $FLAGS "$@"
+$CCACHE "$CLANG" $FLAGS "$@"