[zorg] r340213 - [zorg] Update clang on Hexagon builders to 6.0.1

[Krzysztof Parzyszek via llvm-commits]

Author: kparzysz
Date: Mon Aug 20 14:02:26 2018
New Revision: 340213

URL: http://llvm.org/viewvc/llvm-project?rev=340213&view=rev
Log:
[zorg] Update clang on Hexagon builders to 6.0.1

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=340213&r1=340212&r2=340213&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Aug 20 14:02:26 2018
@@ -50,7 +50,7 @@ def _get_llvm_builders():
                         timeout=40, config_name='Release',
                         jobs=16,
                         enable_shared=False,
-                        env={'LD_LIBRARY_PATH': '/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/lib'},
+                        env={'LD_LIBRARY_PATH': '/local/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04/lib'},
                         extra_cmake_args=[
                           "-G", "Unix Makefiles",
                           "-DCMAKE_BUILD_TYPE:STRING=Release",
@@ -64,17 +64,10 @@ def _get_llvm_builders():
                           "-DLLVM_ENABLE_ASSERTIONS:BOOL=ON",
                           "-DLLVM_INCLUDE_TOOLS:BOOL=ON",
                           "-DLLVM_LIT_ARGS:STRING=-v",
-                          "-DCMAKE_CXX_FLAGS:STRING='-stdlib=libc++ -I/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/include/c++/v1'",
-                          "-DCMAKE_EXE_LINKER_FLAGS:STRING='-lc++abi -L/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/lib'",
-                          "-DCMAKE_SHARED_LINKER_FLAGS:STRING='-lc++abi -L/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/lib'",
+                          "-DLLVM_ENABLE_LIBCXX:BOOL=ON",
                           "-DWITH_POLLY:BOOL=OFF",
-                          "-DLINK_POLLY_INTO_TOOLS:BOOL=OFF",
-                          "-DPOLLY_BUILD_SHARED_LIB:BOOL=OFF",
-                          "-DWITH_POLLY:BOOL=OFF",
-                          "-DLINK_POLLY_INTO_TOOLS:BOOL=OFF",
-                          "-DPOLLY_BUILD_SHARED_LIB:BOOL=OFF",
-                          "-DCMAKE_C_COMPILER:FILEPATH=/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang",
-                          "-DCMAKE_CXX_COMPILER:FILEPATH=/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang++"
+                          "-DCMAKE_C_COMPILER:FILEPATH=/local/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang",
+                          "-DCMAKE_CXX_COMPILER:FILEPATH=/local/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang++"
                         ])},
         {'name': "llvm-avr-linux",
          'slavenames':["avr-build-01"],
@@ -565,7 +558,7 @@ def _get_clang_builders():
             checkout_clang_tools_extra=False,
             checkout_compiler_rt=False,
             checkout_lld=False,
-            env={'LD_LIBRARY_PATH': '/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/lib'},
+            env={'LD_LIBRARY_PATH': '/local/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04/lib'},
             extra_cmake_args=[
               "-DCMAKE_BUILD_TYPE:STRING=Release",
               "-DLLVM_TARGETS_TO_BUILD:STRING=Hexagon",
@@ -578,17 +571,12 @@ def _get_clang_builders():
               "-DLLVM_ENABLE_ASSERTIONS:BOOL=ON",
               "-DLLVM_INCLUDE_TOOLS:BOOL=ON",
               "-DLLVM_LIT_ARGS:STRING=-v",
-              "-DCMAKE_CXX_FLAGS:STRING='-stdlib=libc++ -I/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/include/c++/v1'",
-              "-DCMAKE_EXE_LINKER_FLAGS:STRING='-lc++abi -L/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/lib'",
-              "-DCMAKE_SHARED_LINKER_FLAGS:STRING='-lc++abi -L/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/lib'",
-              "-DWITH_POLLY:BOOL=OFF",
-              "-DLINK_POLLY_INTO_TOOLS:BOOL=OFF",
-              "-DPOLLY_BUILD_SHARED_LIB:BOOL=OFF",
+              "-DLLVM_ENABLE_LIBCXX:BOOL=ON",
               "-DWITH_POLLY:BOOL=OFF",
               "-DLINK_POLLY_INTO_TOOLS:BOOL=OFF",
               "-DPOLLY_BUILD_SHARED_LIB:BOOL=OFF",
-              "-DCMAKE_C_COMPILER:FILEPATH=/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang",
-              "-DCMAKE_CXX_COMPILER:FILEPATH=/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang++"])},
+              "-DCMAKE_C_COMPILER:FILEPATH=/local/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang",
+              "-DCMAKE_CXX_COMPILER:FILEPATH=/local/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang++"])},
 
         {'name': "perf-x86_64-penryn-O3",
          'slavenames':["pollyperf2", "pollyperf3", "pollyperf4", "pollyperf5"],