diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2020-01-07 21:49:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-07 21:49:24 +0100 |
| commit | ac86bb091d01e6299d6f3e88c531d1cd6903474d (patch) | |
| tree | 58547c7fb7e56062c1ca13f700869e2ab4590245 | |
| parent | 812324f02d0ed2ec08bf6b71acce5df766a40f53 (diff) | |
| parent | a9bf7751f7b1017940847bff310ee21527ba3621 (diff) | |
Merge pull request #11689 from vespa-engine/toregge/correct-scope-when-setting-default-compiler-for-darwin
Correct scope when setting default c and cxx compiler for darwin.
| -rw-r--r-- | default_build_settings.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index deb9707ed3c..7d43c99b45d 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -250,13 +250,13 @@ function(vespa_use_default_cxx_compiler) endif() if(VESPA_COMPILER_VARIANT STREQUAL "gcc") if(APPLE) - set(DEFAULT_CMAKE_C_COMPILER "/usr/local/bin/gcc-9" PARENT_SCOPE) - set(DEFAULT_CMAKE_CXX_COMPILER "/usr/local/bin/g++-9" PARENT_SCOPE) + set(DEFAULT_CMAKE_C_COMPILER "/usr/local/bin/gcc-9") + set(DEFAULT_CMAKE_CXX_COMPILER "/usr/local/bin/g++-9") endif() elseif(VESPA_COMPILER_VARIANT STREQUAL "clang") if(APPLE) - set(DEFAULT_CMAKE_C_COMPILER, "/usr/local/opt/llvm/bin/clang" PARENT_SCOPE) - set(DEFAULT_CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++" PARENT_SCOPE) + set(DEFAULT_CMAKE_C_COMPILER, "/usr/local/opt/llvm/bin/clang") + set(DEFAULT_CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++") elseif(VESPA_OS_DISTRO STREQUAL "fedora") set(DEFAULT_CMAKE_C_COMPILER "/usr/bin/clang") set(DEFAULT_CMAKE_CXX_COMPILER "/usr/bin/clang++") @@ -265,8 +265,8 @@ function(vespa_use_default_cxx_compiler) endif() elseif(VESPA_COMPILER_VARIANT STREQUAL "appleclang") if(APPLE) - set(DEFAULT_CMAKE_C_COMPILER "/usr/bin/clang" PARENT_SCOPE) - set(DEFAULT_CMAKE_CXX_COMPILER "/usr/bin/clang++" PARENT_SCOPE) + set(DEFAULT_CMAKE_C_COMPILER "/usr/bin/clang") + set(DEFAULT_CMAKE_CXX_COMPILER "/usr/bin/clang++") else() message(FATAL_ERROR "-- appleclang compiler variant not supported for ${VESPA_OS_DISTRO_COMBINED}") endif() |