diff options
| author | Henning Baldersheim <balder@oath.com> | 2018-08-12 23:10:08 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@oath.com> | 2018-08-12 23:10:08 +0200 |
| commit | 0544917ad77406199f64413436b1c372b52c47f3 (patch) | |
| tree | 27e7f9864571afb3c27e7a7a815ab8eade09bb10 /bootstrap-cmake.sh | |
| parent | 12543c1067097194c0501b3add2ead43183f68e1 (diff) | |
Default now 5.0 for llvm
Diffstat (limited to 'bootstrap-cmake.sh')
| -rwxr-xr-x[-rw-r--r--] | bootstrap-cmake.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index 739dc79f001..572146710b8 100644..100755 --- a/bootstrap-cmake.sh +++ b/bootstrap-cmake.sh @@ -20,11 +20,16 @@ else exit 1 fi +if [ -z "$VESPA_LLVM_VERSION" ]; then + VESPA_LLVM_VERSION=5.0 +fi + cmake3 \ -DCMAKE_INSTALL_PREFIX=/opt/vespa \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ - -DEXTRA_LINK_DIRECTORY="/opt/vespa-gtest/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm3.9/lib" \ - -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-gtest/include;/opt/vespa-boost/include;/opt/vespa-cppunit/include;/usr/include/llvm3.9" \ - -DCMAKE_INSTALL_RPATH="/opt/vespa/lib64;/opt/vespa-gtest/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/lib64/llvm3.9/lib" \ + -DEXTRA_LINK_DIRECTORY="/opt/vespa-gtest/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ + -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-gtest/include;/opt/vespa-boost/include;/opt/vespa-cppunit/include;/usr/include/llvm$VESPA_LLVM_VERSION" \ + -DCMAKE_INSTALL_RPATH="$HOME/vespa/lib64;/opt/vespa-gtest/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ ${EXTRA_CMAKE_ARGS} \ + -DVESPA_LLVM_VERSION=$VESPA_LLVM_VERSION \ "${SOURCE_DIR}" |