Updated CI build machine configs

[libcds.git] / build / CI / VASEx-CI-2 / cds-libs

diff --git a/build/CI/VASEx-CI-2/cds-libs b/build/CI/VASEx-CI-2/cds-libs
index 6ad08453d2fb6570ce1a1317f22eac2f055a2fa2..6b27eb7b49f838ba0d6281e2fc6c8ad3c83f0bf9 100644 (file)
--- a/build/CI/VASEx-CI-2/cds-libs
+++ b/build/CI/VASEx-CI-2/cds-libs
@@ -11,7 +11,7 @@ gtest-include:          $GTEST_ROOT/googletest/include
 gcc-4.8-root:           $GCC48_ROOT/bin
 gcc-4.8-cxx:            g++-4.8
 gcc-4.8-cc:             gcc-4.8
-gcc-4.8-exe-ldflags:    -L$GCC48_ROOT/lib -Wl,-rpath=$GCC48_ROOT/lib
+gcc-4.8-exe-ldflags:    -L$GCC48_ROOT/lib64 -Wl,-rpath=$GCC48_ROOT/lib64
 gcc-4.8-extlib:         rt
 gcc-4.8-boost:          $BOOST_ROOT
 gcc-4.8-64-boost-lib:   stage64-gcc4.8/lib
@@ -40,8 +40,8 @@ gcc-5-boost:          $BOOST_ROOT
 gcc-5-exe-ldflags:    -Wl,-rpath=$GCC5_ROOT/lib64
 gcc-5-extlib:         rt
 gcc-5-64-boost-lib:   stage64-gcc5/lib
-gcc-5-64-asan-boost-lib:   stage64-gcc5-asan
-gcc-5-64-tsan-boost-lib:   stage64-gcc5-tsan
+gcc-5-64-asan-boost-lib:   stage64-gcc5-asan/lib
+gcc-5-64-tsan-boost-lib:   stage64-gcc5-tsan/lib
 gcc-5-gtest:          $GTEST_ROOT
 gcc-5-64-gtest-lib:   $GTEST_ROOT/lib-gcc5/libgtest.a
 
@@ -54,8 +54,8 @@ gcc-6-boost:          $BOOST_ROOT
 gcc-6-exe-ldflags:    -Wl,-rpath=$GCC6_ROOT/lib64
 gcc-6-extlib:         rt
 gcc-6-64-boost-lib:   stage64-gcc6/lib
-gcc-6-64-asan-boost-lib:   stage64-gcc6-asan
-gcc-6-64-tsan-boost-lib:   stage64-gcc6-tsan
+gcc-6-64-asan-boost-lib:   stage64-gcc6-asan/lib
+gcc-6-64-tsan-boost-lib:   stage64-gcc6-tsan/lib
 gcc-6-gtest:          $GTEST_ROOT
 gcc-6-64-gtest-lib:   $GTEST_ROOT/lib-gcc6/libgtest.a
 
@@ -80,12 +80,13 @@ clang-3.7-ld-lib-path:    $GCC6_ROOT/lib64
 clang-3.7-cxx:            clang++
 clang-3.7-cc:             clang
 clang-3.7-cxxflags:       -stdlib=libc++ -Wdocumentation
-clang-3.7-exe-ldflags:    -L$CLANG37_ROOT/lib-Wl, -rpath=$CLANG37_ROOT/lib
-clang-3.7-extlib:         rt c++abi
+clang-3.7-exe-ldflags:    -L$CLANG37_ROOT/lib -Wl,-rpath=$CLANG37_ROOT/lib -lc++abi
+clang-3.7-extlib:         rt
 clang-3.7-boost:          $BOOST_ROOT
 clang-3.7-64-boost-lib:   stage64-clang3.7/lib
 clang-3.7-gtest:          $GTEST_ROOT
 clang-3.7-64-gtest-lib:   $GTEST_ROOT/lib-clang3.7/libgtest.a
+clang-3.7-cmake-flags:    -DCMAKE_C_COMPILER_WORKS=1 -DCMAKE_CXX_COMPILER_WORKS=1
 
 
 ########################################
@@ -114,12 +115,27 @@ clang-3.9-exe-ldflags:    -L$CLANG39_ROOT/lib -Wl,-rpath=$CLANG39_ROOT/lib
 clang-3.9-extlib:         rt
 clang-3.9-boost:          $BOOST_ROOT
 clang-3.9-64-boost-lib:   stage64-clang3.9/lib
-clang-3.9-64-asan-boost-lib:   stage64-clang3.9-asan
-clang-3.9-64-tsan-boost-lib:   stage64-clang3.9-tsan
+clang-3.9-64-asan-boost-lib:   stage64-clang3.9-asan/lib
+clang-3.9-64-tsan-boost-lib:   stage64-clang3.9-tsan/lib
 clang-3.9-gtest:          $GTEST_ROOT
 clang-3.9-64-gtest-lib:   $GTEST_ROOT/lib-clang3.9/libgtest.a
 
 
+########################################
+# clang-4
+clang-4-root:           $CLANG4_ROOT/bin
+clang-4-cxx:            clang++
+clang-4-cc:             clang
+clang-4-cxxflags:       -stdlib=libc++ -Wdocumentation
+clang-4-exe-ldflags:    -L$CLANG4_ROOT/lib -Wl,-rpath=$CLANG4_ROOT/lib
+clang-4-extlib:         rt
+clang-4-boost:          $BOOST_ROOT
+clang-4-64-boost-lib:   stage64-clang4/lib
+clang-4-64-asan-boost-lib:   stage64-clang4-asan/lib
+clang-4-64-tsan-boost-lib:   stage64-clang4-tsan/lib
+clang-4-gtest:          $GTEST_ROOT
+clang-4-64-gtest-lib:   $GTEST_ROOT/lib-clang4/libgtest.a
+