[build] Xcode 10 no longer exposes DEVELOPER_DIR to the compiler laun…

…cher We'll have to extract the location of Xcode's developer dir from $PATH :(
mapbox · Jun 11, 2018 · 7a76eb2 · 7a76eb2
1 parent 0b883fd
commit 7a76eb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/launch-c-xcode.in b/scripts/launch-c-xcode.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 export CCACHE_CPP2=true
-exec "@C_LAUNCHER@" "${DEVELOPER_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" "$@"
+exec "@C_LAUNCHER@" "${PATH%%/Contents/Developer/*}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" "$@"
diff --git a/scripts/launch-cxx-xcode.in b/scripts/launch-cxx-xcode.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 export CCACHE_CPP2=true
-exec "@CXX_LAUNCHER@" "${DEVELOPER_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" "$@"
+exec "@CXX_LAUNCHER@" "${PATH%%/Contents/Developer/*}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" "$@"