diff options
| author | Bradley Sepos <[email protected]> | 2017-09-06 13:42:32 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2017-09-06 13:42:56 -0400 |
| commit | cb7069323745e34314eb58283e6afdfceb9c0291 (patch) | |
| tree | ee155f29671893dad67937660824b29a11e7d2ab /make | |
| parent | 013a6e9d5b23a69a6ec8c6bbbbdae4cef0740cba (diff) | |
build: Quote variables in xcodemake.
Partially fixes building in Xcode via Product > Archive.
Diffstat (limited to 'make')
| -rwxr-xr-x | make/xcodemake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/make/xcodemake b/make/xcodemake index f3aa4e6ae..972f6d386 100755 --- a/make/xcodemake +++ b/make/xcodemake @@ -86,11 +86,11 @@ case "$spec" in esac ## compute if re/configure necessary -if [ ! -f $EXTERNAL_BUILD/GNUmakefile ]; then +if [ ! -f "$EXTERNAL_BUILD/GNUmakefile" ]; then reconfigure="no configuration present" -elif [ $EXTERNAL_SRC/make/configure.py -nt $EXTERNAL_BUILD/GNUmakefile ]; then +elif [ "$EXTERNAL_SRC/make/configure.py" -nt "$EXTERNAL_BUILD/GNUmakefile" ]; then reconfigure="configure script was updated" -elif [ $EXTERNAL_DRIVER == "bootstrap" ]; then +elif [ "$EXTERNAL_DRIVER" == "bootstrap" ]; then reconfigure="driver bootstrap" else reconfigure= @@ -160,7 +160,7 @@ if [ -n "$reconfigure" ]; then EXTERNAL_CONFIGURE= ## invoke configure with (hidden) option which indicates conf performed by xcode - (set -ex; $EXTERNAL_SRC/configure --force \ + (set -ex; "$EXTERNAL_SRC/configure" --force \ $EXTERNAL_CONF_ARGS \ --build="$EXTERNAL_BUILD" \ $driver \ @@ -171,11 +171,11 @@ if [ -n "$reconfigure" ]; then fi ## log environment as provided by Xcode -logdir=$EXTERNAL_BUILD/log -if [ ! -d $logdir ]; then - mkdir -p $logdir +logdir="$EXTERNAL_BUILD/log" +if [ ! -d "$logdir" ]; then + mkdir -p "$logdir" fi -env | sort > $logdir/xcodemake.env.txt +env | sort > "$logdir/xcodemake.env.txt" [ $exit_post_log -ne 0 ] && exit 0 @@ -196,4 +196,4 @@ fi ## pull the trigger ## must set XCODE.driver to prevent inifinite recursion set -x -exec make -C $EXTERNAL_BUILD XCODE.driver=xcodemake $jobs $goals $EXTERNAL_VARS +exec make -C "$EXTERNAL_BUILD" XCODE.driver=xcodemake $jobs $goals $EXTERNAL_VARS |