diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-06-08 13:11:27 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-06-11 17:17:01 +0200 |
| commit | b587785fea150aa764da5d56403c84e4b8bb7084 (patch) | |
| tree | 87a9cf4e2e8a3c8c3d0d8bb13bef2dcba968e0da | |
| parent | 3c93f75386219e3fd6d73db06b9b63a025a3578d (diff) | |
| download | qtlocation-mapboxgl-b587785fea150aa764da5d56403c84e4b8bb7084.tar.gz | |
[build] Xcode 10 no longer exposes DEVELOPER_DIR to the compiler launcher
We'll have to extract the location of Xcode's developer dir from $PATH :(
| -rw-r--r-- | scripts/launch-c-xcode.in | 2 | ||||
| -rw-r--r-- | scripts/launch-cxx-xcode.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/launch-c-xcode.in b/scripts/launch-c-xcode.in index 77a0c8aca3..837e1738e8 100644 --- 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 index 7d4639ce6d..9532b6f9af 100644 --- 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++" "$@" |