From 698542cf459e51cd72f7bc46b6979a9d67b33309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Mon, 17 Jul 2017 15:22:09 +0200 Subject: [build] make Xcode use the correct compiler when it is installed in a non-standard location --- scripts/launch-c-xcode.in | 4 ++++ scripts/launch-c.in | 8 +------- scripts/launch-cxx-xcode.in | 4 ++++ scripts/launch-cxx.in | 8 +------- 4 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 scripts/launch-c-xcode.in create mode 100644 scripts/launch-cxx-xcode.in (limited to 'scripts') diff --git a/scripts/launch-c-xcode.in b/scripts/launch-c-xcode.in new file mode 100644 index 0000000000..77a0c8aca3 --- /dev/null +++ b/scripts/launch-c-xcode.in @@ -0,0 +1,4 @@ +#!/bin/sh + +export CCACHE_CPP2=true +exec "@C_LAUNCHER@" "${DEVELOPER_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" "$@" diff --git a/scripts/launch-c.in b/scripts/launch-c.in index 6c6c9180bc..94555f32aa 100644 --- a/scripts/launch-c.in +++ b/scripts/launch-c.in @@ -1,10 +1,4 @@ #!/bin/sh -# Xcode generator doesn't include the compiler as the -# first argument, Ninja and Makefiles do. Handle both cases. -if [ "$1" = "${CMAKE_C_COMPILER}" ] ; then - shift -fi - export CCACHE_CPP2=true -exec "${C_LAUNCHER}" "${CMAKE_C_COMPILER}" "$@" +exec "@C_LAUNCHER@" "$@" diff --git a/scripts/launch-cxx-xcode.in b/scripts/launch-cxx-xcode.in new file mode 100644 index 0000000000..7d4639ce6d --- /dev/null +++ b/scripts/launch-cxx-xcode.in @@ -0,0 +1,4 @@ +#!/bin/sh + +export CCACHE_CPP2=true +exec "@CXX_LAUNCHER@" "${DEVELOPER_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" "$@" diff --git a/scripts/launch-cxx.in b/scripts/launch-cxx.in index 23f107ce48..46671c1c64 100644 --- a/scripts/launch-cxx.in +++ b/scripts/launch-cxx.in @@ -1,10 +1,4 @@ #!/bin/sh -# Xcode generator doesn't include the compiler as the -# first argument, Ninja and Makefiles do. Handle both cases. -if [ "$1" = "${CMAKE_CXX_COMPILER}" ] ; then - shift -fi - export CCACHE_CPP2=true -exec "${CXX_LAUNCHER}" "${CMAKE_CXX_COMPILER}" "$@" \ No newline at end of file +exec "@CXX_LAUNCHER@" "$@" -- cgit v1.2.1