summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macosx/HandBrake.xcodeproj/project.pbxproj4
-rwxr-xr-xmake/xcodemake5
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