summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2017-12-29 13:09:38 -0500
committerBradley Sepos <[email protected]>2018-01-10 01:39:55 -0500
commit5c523dcaae9b69a3235a4b20631bc922afd028ca (patch)
tree9f88538dbab8faf536722854c9c36e7f95e3d44c /make
parent00da2c7ef77da4c65c764113d4b6cfda281736d3 (diff)
build: Unclobber PATH when shunting build through Xcode.
Tools shipping with Xcode are still in PATH, only moved from first to last priority. Avoids accidentally using old tools where a newer version is installed. This ensures the tools identified by configure will be the exact tools used by make via Xcode.
Diffstat (limited to 'make')
-rwxr-xr-xmake/xcodemake5
1 files changed, 5 insertions, 0 deletions
diff --git a/make/xcodemake b/make/xcodemake
index 4b0c29119..78c5ff390 100755
--- a/make/xcodemake
+++ b/make/xcodemake
@@ -100,6 +100,11 @@ fi
if [ -n "$reconfigure" ]; then
echo "reconfiguring ($reconfigure)"
+ ## respect PATH priority
+ export PATH="${PATH#$SYSTEM_DEVELOPER_BIN_DIR:}:${SYSTEM_DEVELOPER_BIN_DIR}"
+ echo "Unclobbering PATH:"
+ echo " export PATH=\"${PATH}\""
+
if [ "$EXTERNAL_DRIVER" == "bootstrap" ]; then
driver="--xcode-driver=terminal"
else