diff options
| author | Bradley Sepos <[email protected]> | 2017-12-29 13:09:38 -0500 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-01-10 01:39:55 -0500 |
| commit | 5c523dcaae9b69a3235a4b20631bc922afd028ca (patch) | |
| tree | 9f88538dbab8faf536722854c9c36e7f95e3d44c | |
| parent | 00da2c7ef77da4c65c764113d4b6cfda281736d3 (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.
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 4 | ||||
| -rwxr-xr-x | make/xcodemake | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 8fdec2031..17b667e8d 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -2123,6 +2123,7 @@ 273F217214ADD2170021BE6D /* debug */ = { isa = XCBuildConfiguration; buildSettings = { + PATH = $PATH; PRODUCT_NAME = external; }; name = debug; @@ -2130,6 +2131,7 @@ 273F217314ADD2170021BE6D /* release */ = { isa = XCBuildConfiguration; buildSettings = { + PATH = $PATH; PRODUCT_NAME = external; }; name = release; @@ -2423,6 +2425,7 @@ A9A5CD9A1E32072F00947914 /* debug-sandbox */ = { isa = XCBuildConfiguration; buildSettings = { + PATH = $PATH; PRODUCT_NAME = external; }; name = "debug-sandbox"; @@ -2666,6 +2669,7 @@ A9A5CDA01E32073800947914 /* release-sandbox */ = { isa = XCBuildConfiguration; buildSettings = { + PATH = $PATH; PRODUCT_NAME = external; }; name = "release-sandbox"; 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 |