From 7a76eb23ea1e47a8fdbd8cdc5220f01e8671c00a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Fri, 8 Jun 2018 13:11:27 +0200 Subject: [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 :( --- scripts/launch-c-xcode.in | 2 +- 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++" "$@" -- cgit v1.2.1