diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-17 12:21:55 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-17 12:21:55 +0000 |
| commit | 85466f528583dd460456503a6b941f0e23f2ea64 (patch) | |
| tree | d715c2c8cdb84ce3975c7bfbd14f5d3db43c04c7 | |
| parent | d7a45e1d9c780d625d89478b215d2d4090399c16 (diff) | |
LLVM 7
| -rwxr-xr-x | bootstrap-cmake.sh | 7 | ||||
| -rw-r--r-- | default_build_settings.cmake | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index 27c7ed6c21b..dbe27f5b8bf 100755 --- a/bootstrap-cmake.sh +++ b/bootstrap-cmake.sh @@ -39,7 +39,8 @@ else fi if [ -z "$VESPA_LLVM_VERSION" ]; then - VESPA_LLVM_VERSION=5.0 + VESPA_LLVM_VERSION_PATH=7.0 + VESPA_LLVM_VERSION=7 fi if $UNPRIVILEGED; then @@ -54,8 +55,8 @@ cmake3 \ -DCMAKE_INSTALL_PREFIX=${VESPA_INSTALL_PREFIX} \ -DJAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-openjdk} \ -DCMAKE_PREFIX_PATH="/opt/vespa-deps" \ - -DEXTRA_LINK_DIRECTORY="/opt/vespa-deps/lib64;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ - -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-deps/include;/usr/include/llvm$VESPA_LLVM_VERSION;/usr/include/openblas" \ + -DEXTRA_LINK_DIRECTORY="/opt/vespa-deps/lib64;/usr/lib64/llvm$VESPA_LLVM_VERSION_PATH/lib" \ + -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-deps/include;/usr/include/llvm$VESPA_LLVM_VERSION_PATH;/usr/include/openblas" \ -DCMAKE_INSTALL_RPATH="${VESPA_INSTALL_PREFIX}/lib64;/opt/vespa-deps/lib64;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ ${UNPRIVILEGED_ARGS} \ ${EXTRA_CMAKE_ARGS} \ diff --git a/default_build_settings.cmake b/default_build_settings.cmake index cdc1f8e0848..0a38da145d0 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -11,7 +11,7 @@ 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/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) + set(DEFAULT_VESPA_LLVM_VERSION "7" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_rhel_8_1) |