Split out cmake command into separate bootstrap script

1 files changed, 2 insertions, 8 deletions

diff --git a/bootstrap-cpp.sh b/bootstrap-cpp.sh
index aef18a9a020..6495bf0177c 100755
--- a/bootstrap-cpp.sh
+++ b/bootstrap-cpp.sh
@@ -19,14 +19,8 @@ fi
 
 mkdir -p "${BUILD_DIR}"
 
-source /opt/rh/devtoolset-6/enable || true
+source /etc/profile.d/devtoolset-6.sh || true
 cd "${SOURCE_DIR}"
 sh ./bootstrap.sh full
 cd "${BUILD_DIR}"
-cmake3 \
-    -DCMAKE_INSTALL_PREFIX=/opt/vespa \
-    -DJAVA_HOME=/usr/lib/jvm/java-openjdk \
-    -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm3.9/lib" \
-    -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include;/usr/include/llvm3.9" \
-    -DCMAKE_INSTALL_RPATH="/opt/vespa/lib64;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/include/llvm3.9" \
-    "${SOURCE_DIR}"
+sh ${SOURCE_DIR}/bootstrap-cmake.sh ${SOURCE_DIR}