summaryrefslogtreecommitdiffstats
path: root/default_build_settings.cmake
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-04-17 11:50:39 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-04-17 11:50:39 +0000
commitd7a45e1d9c780d625d89478b215d2d4090399c16 (patch)
tree6b063a8983c26f0991dcd9946e86b95e2031dd7f /default_build_settings.cmake
parent62ae148d68b47bc41b474b5f9d54695df6b28654 (diff)
Require LLVM 7 for centos 7 and rhel 7
Diffstat (limited to 'default_build_settings.cmake')
-rw-r--r--default_build_settings.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake
index 622755495c2..cdc1f8e0848 100644
--- a/default_build_settings.cmake
+++ b/default_build_settings.cmake
@@ -9,9 +9,9 @@ endfunction()
function(setup_vespa_default_build_settings_rhel_7_7)
message("-- Setting up default build settings for rhel 7.7")
- set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm5.0/lib" PARENT_SCOPE)
- set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/llvm5.0" "/usr/include/openblas" PARENT_SCOPE)
- set(DEFAULT_VESPA_LLVM_VERSION "5.0" PARENT_SCOPE)
+ set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm7.0/lib" PARENT_SCOPE)
+ set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/llvm7.0" "/usr/include/openblas" PARENT_SCOPE)
+ set(DEFAULT_VESPA_LLVM_VERSION "7.0" PARENT_SCOPE)
endfunction()
function(setup_vespa_default_build_settings_rhel_8_1)
@@ -21,9 +21,9 @@ endfunction()
function(setup_vespa_default_build_settings_centos_7)
message("-- Setting up default build settings for centos 7")
- set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm5.0/lib" PARENT_SCOPE)
- set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/llvm5.0" "/usr/include/openblas" PARENT_SCOPE)
- set(DEFAULT_VESPA_LLVM_VERSION "5.0" PARENT_SCOPE)
+ set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm7.0/lib" PARENT_SCOPE)
+ set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/llvm7.0" "/usr/include/openblas" PARENT_SCOPE)
+ set(DEFAULT_VESPA_LLVM_VERSION "7" PARENT_SCOPE)
endfunction()
function(setup_vespa_default_build_settings_centos_8)