diff options
author | Marco Poletti <poletti.marco@gmail.com> | 2020-05-02 15:02:00 -0700 |
---|---|---|
committer | Marco Poletti <poletti.marco@gmail.com> | 2020-05-02 15:02:00 -0700 |
commit | 2358d8128ab240ab139c96f316dfd0ff6ca44b7c (patch) | |
tree | adbf16299c76a1c8885a84299934c7c0439624c5 /extras | |
parent | cd154e310d2032e83e5a2ad6472a32cce9ca31e9 (diff) | |
download | google-fruit-2358d8128ab240ab139c96f316dfd0ff6ca44b7c.tar.gz |
Setting the compiler via the CC/CXX env vars doesn't work with recent versions of XCode, set it as cmake params too.
Diffstat (limited to 'extras')
-rwxr-xr-x | extras/scripts/postsubmit-helper.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/extras/scripts/postsubmit-helper.sh b/extras/scripts/postsubmit-helper.sh index e32bec4..550c0b0 100755 --- a/extras/scripts/postsubmit-helper.sh +++ b/extras/scripts/postsubmit-helper.sh @@ -156,6 +156,8 @@ then ReleaseValgrindNoPchNoClangTidy) CMAKE_ARGS=(-DCMAKE_BUILD_TYPE=Release -DFRUIT_ENABLE_CLANG_TIDY=FALSE -DCMAKE_CXX_FLAGS="$COMMON_CXX_FLAGS" -DRUN_TESTS_UNDER_VALGRIND=TRUE -DFRUIT_TESTS_USE_PRECOMPILED_HEADERS=OFF) ;; *) echo "Error: you need to specify one of the supported postsubmit modes (see postsubmit.sh)."; exit 1 ;; esac + # Setting compilers only via env vars doesn't work when using recent versions of XCode. + CMAKE_ARGS+=(-DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX) SOURCES_PATH="$PWD" |