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.

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 8fdec20315ab3d0b676f993324349d2c8d4947d6..17b667e8d1b53eaa00cde1736429bc79b62f8b2f 100644 (file)
--- 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 4b0c29119941fe7c2b52814b710662eed5bccbc1..78c5ff390b21bfd5846c01a30c3683d1f3766930 100755 (executable)
--- 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