From cf3ed8f370b13713fc25c8f201997a6f0718416b Mon Sep 17 00:00:00 2001
From: Rafael Kitover <rkitover@gmail.com>
Date: Mon, 12 Nov 2018 04:47:59 -0800
Subject: [PATCH] builder: fix quoting issues introduced in 37869441

In host_env/target_env/etc. functions, quote all variables values so
that they pass through eval correctly.
---
 tools/builder/mingw.sh  | 38 +++++++++++++++++++-------------------
 tools/win/msys2-builder |  6 +++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/tools/builder/mingw.sh b/tools/builder/mingw.sh
index deca63c5..e0086968 100644
--- a/tools/builder/mingw.sh
+++ b/tools/builder/mingw.sh
@@ -76,19 +76,19 @@ host_env() {
     ln -sf "$BUILD_ROOT/host" "$BUILD_ROOT/root"
     if [ -z "$OCC" ]; then
         cat <<EOF
-OCC=$CC
-OCXX=$CXX
-OCC_ORIG=$CC_ORIG
-OCXX_ORIG=$CXX_ORIG
-OCPPFLAGS=$CPPFLAGS
-OCFLAGS=$CFLAGS
-OCXXFLAGS=$CXXFLAGS
-OOBJCXXFLAGS=$OBJCXXFLAGS
-OLDFLAGS=$LDFLAGS
-OLIBS=$LIBS
-OUUID_LIBS=$UUID_LIBS
-OSTRIP=$STRIP
-OPATH=$PATH
+OCC="$CC"
+OCXX="$CXX"
+OCC_ORIG="$CC_ORIG"
+OCXX_ORIG="$CXX_ORIG"
+OCPPFLAGS="$CPPFLAGS"
+OCFLAGS="$CFLAGS"
+OCXXFLAGS="$CXXFLAGS"
+OOBJCXXFLAGS="$OBJCXXFLAGS"
+OLDFLAGS="$LDFLAGS"
+OLIBS="$LIBS"
+OUUID_LIBS="$UUID_LIBS"
+OSTRIP="$STRIP"
+OPATH="$PATH"
 
 export CC="$HOST_CC"
 export CXX="$HOST_CXX"
@@ -104,11 +104,11 @@ export UUID_LIBS="$HOST_UUID_LIBS"
 export STRIP="$HOST_STRIP"
 export PATH="$BUILD_ROOT/host/bin:$PATH"
 
-OREQUIRED_CONFIGURE_ARGS=$REQUIRED_CONFIGURE_ARGS
-OREQUIRED_CMAKE_ARGS=$REQUIRED_CMAKE_ARGS
+OREQUIRED_CONFIGURE_ARGS="$REQUIRED_CONFIGURE_ARGS"
+OREQUIRED_CMAKE_ARGS="$REQUIRED_CMAKE_ARGS"
 
-REQUIRED_CONFIGURE_ARGS=$(puts "$REQUIRED_CONFIGURE_ARGS" | sed 's/--host[^ ]*//g')
-REQUIRED_CMAKE_ARGS=$(puts "$REQUIRED_CMAKE_ARGS" | sed 's/-DCMAKE_TOOLCHAIN_FILE=[^ ]*//g')
+REQUIRED_CONFIGURE_ARGS="$(puts "$REQUIRED_CONFIGURE_ARGS" | sed 's/--host[^ ]*//g')"
+REQUIRED_CMAKE_ARGS="$(puts "$REQUIRED_CMAKE_ARGS" | sed 's/-DCMAKE_TOOLCHAIN_FILE=[^ ]*//g')"
 EOF
     fi
 
@@ -136,8 +136,8 @@ export STRIP="$OSTRIP"
 export PATH="$OPATH"
 OCC= OCXX= OCC_ORIG= OCXX_ORIG= OCPPFLAGS= OCFLAGS= OCXXFLAGS= OOBJCXXFLAGS= OLDFLAGS= OLIBS= OUUID_LIBS= OSTRIP= OPATH=
 
-REQUIRED_CONFIGURE_ARGS=$OREQUIRED_CONFIGURE_ARGS
-REQUIRED_CMAKE_ARGS=$OREQUIRED_CMAKE_ARGS
+REQUIRED_CONFIGURE_ARGS="$OREQUIRED_CONFIGURE_ARGS"
+REQUIRED_CMAKE_ARGS="$OREQUIRED_CMAKE_ARGS"
 OREQUIRED_CONFIGURE_ARGS= OREQUIRED_CMAKE_ARGS=
 EOF
     fi
diff --git a/tools/win/msys2-builder b/tools/win/msys2-builder
index cbd8da64..1fb98483 100755
--- a/tools/win/msys2-builder
+++ b/tools/win/msys2-builder
@@ -110,7 +110,7 @@ host_env() {
     cat <<EOF
 unset MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE ACLOCAL_PATH PKG_CONFIG_PATH
 
-OPWD=$PWD
+OPWD="$PWD"
 export MSYSTEM=MSYS
 . /etc/profile || :
 . ~/.bashrc 2>/dev/null || :
@@ -126,8 +126,8 @@ target_env() {
     cat <<EOF
 unset MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE ACLOCAL_PATH PKG_CONFIG_PATH
 
-OPWD=$PWD
-export MSYSTEM=$OMSYSTEM
+OPWD="$PWD"
+export MSYSTEM="$OMSYSTEM"
 . /etc/profile || :
 . ~/.bashrc 2>/dev/null || :
 $BUILD_ENV