Xcode: fix race condition when invoking ninja

Don't create temp ninja files for invocation from Xcode in deps/
Instead create then in build directory and in a way that prevents race
conditions when multiple targets are launched in parallel.

.gitignore

@@ -29,7 +29,6 @@ macosx/dsa_priv.pem
 /x64/
 
 /deps/tarballs
-/deps/build.vars.local.ninja
 /deps/.ninja_deps
 /deps/.ninja_log
 /deps/gettext/build-aux/test-driver

deps/build.vars.ninja

@@ -1,5 +1,3 @@
-# Local settings (regenerated by Xcode):
-include build.vars.local.ninja
 
 # Compiler etc. variables:
 ncpu = `sysctl -n hw.ncpu`
@@ -12,4 +10,3 @@ cflags = $cflags_sdk $cflags_config -w
 cxxflags = $cflags_sdk $cflags_config -stdlib=libc++ -w
 ldflags = $ldflags_sdk $ldflags_config
 
-

deps/build_deps.sh

@@ -2,6 +2,12 @@
 
 set -e
 
+mkdir -p "$DEPS_BUILD_DIR"
+if [ ! -d "$DEPS_BUILD_DIR" ] ; then
+    echo "build directory '$DEPS_BUILD_DIR' doesn't exist"
+    exit 1
+fi
+
 if [ "$2" = clean ] ; then
     if [ ! -z "$DEPS_BUILD_DIR" ] ; then
         rm -rf "$DEPS_BUILD_DIR"/*
@@ -57,8 +63,16 @@ else
     ldflags_config=""
 fi
 
-cat <<EOT >build.vars.local.ninja
+# don't produce error if the build is stopped for other reasons
+trap "exit 0" INT
+
+xcode_ninja_file="$DEPS_BUILD_DIR/xcode-$$.ninja"
+trap "rm -f $xcode_ninja_file" EXIT
+
+for ARCH in $ARCHS; do
+    cat <<EOT >$xcode_ninja_file
 # Generated by Xcode on `date`
+
 SDKROOT = $SDKROOT
 MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET
 CONFIGURATION = $CONFIGURATION
@@ -67,6 +81,7 @@ sed = $GSED
 yacc = $YACC
 curl = $CURL
 
+arch = $ARCH
 top_srcdir = `pwd`
 builddir = $DEPS_BUILD_DIR
 
@@ -75,13 +90,10 @@ cxx = $CXX
 
 cflags_config = $cflags_config
 ldflags_config = $ldflags_config
-EOT
-
-# don't produce error if the build is stopped for other reasons
-trap 'exit 0' INT
 
-for ARCH in $ARCHS; do
-    ninja -f build.$ARCH.ninja $1
+include build.ninja
+EOT
+    ninja -f $xcode_ninja_file $1
 done
 
 ../macos/merge-archs.sh "$DEPS_BUILD_DIR/$1"