ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Rafael Kitover 2018-11-12 04:47:59 -08:00
parent 37869441d2
commit cf3ed8f370
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tools/builder/mingw.sh
View File

@ -76,19 +76,19 @@ host_env() {
ln -sf "$BUILD_ROOT/host" "$BUILD_ROOT/root" ln -sf "$BUILD_ROOT/host" "$BUILD_ROOT/root"
if [ -z "$OCC" ]; then if [ -z "$OCC" ]; then
cat <<EOF cat <<EOF
OCC=$CC OCC="$CC"
OCXX=$CXX OCXX="$CXX"
OCC_ORIG=$CC_ORIG OCC_ORIG="$CC_ORIG"
OCXX_ORIG=$CXX_ORIG OCXX_ORIG="$CXX_ORIG"
OCPPFLAGS=$CPPFLAGS OCPPFLAGS="$CPPFLAGS"
OCFLAGS=$CFLAGS OCFLAGS="$CFLAGS"
OCXXFLAGS=$CXXFLAGS OCXXFLAGS="$CXXFLAGS"
OOBJCXXFLAGS=$OBJCXXFLAGS OOBJCXXFLAGS="$OBJCXXFLAGS"
OLDFLAGS=$LDFLAGS OLDFLAGS="$LDFLAGS"
OLIBS=$LIBS OLIBS="$LIBS"
OUUID_LIBS=$UUID_LIBS OUUID_LIBS="$UUID_LIBS"
OSTRIP=$STRIP OSTRIP="$STRIP"
OPATH=$PATH OPATH="$PATH"
export CC="$HOST_CC" export CC="$HOST_CC"
export CXX="$HOST_CXX" export CXX="$HOST_CXX"
@ -104,11 +104,11 @@ export UUID_LIBS="$HOST_UUID_LIBS"
export STRIP="$HOST_STRIP" export STRIP="$HOST_STRIP"
export PATH="$BUILD_ROOT/host/bin:$PATH" export PATH="$BUILD_ROOT/host/bin:$PATH"
OREQUIRED_CONFIGURE_ARGS=$REQUIRED_CONFIGURE_ARGS OREQUIRED_CONFIGURE_ARGS="$REQUIRED_CONFIGURE_ARGS"
OREQUIRED_CMAKE_ARGS=$REQUIRED_CMAKE_ARGS OREQUIRED_CMAKE_ARGS="$REQUIRED_CMAKE_ARGS"
REQUIRED_CONFIGURE_ARGS=$(puts "$REQUIRED_CONFIGURE_ARGS" | sed 's/--host[^ ]*//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') REQUIRED_CMAKE_ARGS="$(puts "$REQUIRED_CMAKE_ARGS" | sed 's/-DCMAKE_TOOLCHAIN_FILE=[^ ]*//g')"
EOF EOF
fi fi
@ -136,8 +136,8 @@ export STRIP="$OSTRIP"
export PATH="$OPATH" export PATH="$OPATH"
OCC= OCXX= OCC_ORIG= OCXX_ORIG= OCPPFLAGS= OCFLAGS= OCXXFLAGS= OOBJCXXFLAGS= OLDFLAGS= OLIBS= OUUID_LIBS= OSTRIP= OPATH= OCC= OCXX= OCC_ORIG= OCXX_ORIG= OCPPFLAGS= OCFLAGS= OCXXFLAGS= OOBJCXXFLAGS= OLDFLAGS= OLIBS= OUUID_LIBS= OSTRIP= OPATH=
REQUIRED_CONFIGURE_ARGS=$OREQUIRED_CONFIGURE_ARGS REQUIRED_CONFIGURE_ARGS="$OREQUIRED_CONFIGURE_ARGS"
REQUIRED_CMAKE_ARGS=$OREQUIRED_CMAKE_ARGS REQUIRED_CMAKE_ARGS="$OREQUIRED_CMAKE_ARGS"
OREQUIRED_CONFIGURE_ARGS= OREQUIRED_CMAKE_ARGS= OREQUIRED_CONFIGURE_ARGS= OREQUIRED_CMAKE_ARGS=
EOF EOF
fi fi

6
tools/win/msys2-builder
View File

@ -110,7 +110,7 @@ host_env() {
cat <<EOF cat <<EOF
unset MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE ACLOCAL_PATH PKG_CONFIG_PATH 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 export MSYSTEM=MSYS
. /etc/profile || : . /etc/profile || :
. ~/.bashrc 2>/dev/null || : . ~/.bashrc 2>/dev/null || :
@ -126,8 +126,8 @@ target_env() {
cat <<EOF cat <<EOF
unset MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE ACLOCAL_PATH PKG_CONFIG_PATH 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=$OMSYSTEM export MSYSTEM="$OMSYSTEM"
. /etc/profile || : . /etc/profile || :
. ~/.bashrc 2>/dev/null || : . ~/.bashrc 2>/dev/null || :
$BUILD_ENV $BUILD_ENV