diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2018-02-14 14:43:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 14:43:26 +0100 |
| commit | 22963ff602da9338422feb2f783ebd9abc0b30d1 (patch) | |
| tree | 5dfa505f33ebee120463299738ee0397dde89282 | |
| parent | 403f24fa0ad8ee4bd4f8f087cdea511bd8fad457 (diff) | |
| parent | c4945571f7753962c843ef17fcbfdd69103907d4 (diff) | |
Merge pull request #5039 from vespa-engine/aressem/fix-llvm-rpath
Fix wrong llvm rpath in bootstrap script.
| -rw-r--r-- | bootstrap-cmake.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index bc127da7a0b..13e49767964 100644 --- a/bootstrap-cmake.sh +++ b/bootstrap-cmake.sh @@ -25,6 +25,6 @@ cmake3 \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm3.9/lib" \ -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-cppunit/include;/usr/include/llvm3.9" \ - -DCMAKE_INSTALL_RPATH="/opt/vespa/lib64;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/include/llvm3.9" \ + -DCMAKE_INSTALL_RPATH="/opt/vespa/lib64;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/lib64/llvm3.9/lib" \ ${EXTRA_CMAKE_ARGS} \ "${SOURCE_DIR}" |