[zorg] r208631 - Changed parameters for SanitizerBuilderII build.

[Galina Kistanova]

Author: gkistanova
Date: Mon May 12 16:00:34 2014
New Revision: 208631

URL: http://llvm.org/viewvc/llvm-project?rev=208631&view=rev
Log:
Changed parameters for SanitizerBuilderII build.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.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=208631&r1=208630&r2=208631&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon May 12 16:00:34 2014
@@ -607,8 +607,7 @@ def _get_sanitizer_builders():
                                           clean=True,
                                           common_cmake_options='-DLLVM_ENABLE_CXX11=ON -DCMAKE_EXE_LINKER_FLAGS=-lcxxrt',
                                           env = {'CC'       : 'clang',
-                                                 'CXX'      : 'clang++',
-                                                 'CXXFLAGS' : '-std=c++11 -stdlib=libc++'})},
+                                                 'CXX'      : 'clang++'})},
           ]
 
 def _get_openmp_builders():

Modified: zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py?rev=208631&r1=208630&r2=208631&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py (original)
+++ zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py Mon May 12 16:00:34 2014
@@ -128,17 +128,19 @@ def getSanitizerBuildFactoryII(
                                workdir=".",
                                env=merged_env))
 
-    # TODO: make it better way
+    # TODO: make it better way - use list for common_cmake_options and just merge.
     if common_cmake_options:
        cmakeCommand = [
             "cmake",
             "-DCMAKE_BUILD_TYPE=%s" % build_type,
+            "-DCMAKE_CXX_FLAGS='-std=c++11 -stdlib=libc++'",
             "%s" % common_cmake_options,
             "../%s" % llvm_srcdir]
     else:
        cmakeCommand = [
             "cmake",
             "-DCMAKE_BUILD_TYPE=%s" % build_type,
+            "-DCMAKE_CXX_FLAGS='-std=c++11 -stdlib=libc++'",
             "../%s" % llvm_srcdir]
 
     # Note: ShellCommand does not pass the params with special symbols correctly.
@@ -192,6 +194,7 @@ def getSanitizerBuildFactoryII(
             "%s" % common_cmake_options,
             "-DCMAKE_C_COMPILER=%s/clang" % clang_path,
             "-DCMAKE_CXX_COMPILER=%s/clang++" % clang_path,
+            "-DCMAKE_CXX_FLAGS='-I../%s/projects/libcxx/include -std=c++11 -stdlib=libc++'" % llvm_srcdir,
             "../%s" % llvm_srcdir]
     else:
        cmakeCommand_llvm64 = [
@@ -199,6 +202,7 @@ def getSanitizerBuildFactoryII(
             "-DCMAKE_BUILD_TYPE=%s" % build_type,
             "-DCMAKE_C_COMPILER=%s/clang" % clang_path,
             "-DCMAKE_CXX_COMPILER=%s/clang++" % clang_path,
+            "-DCMAKE_CXX_FLAGS='-I../%s/projects/libcxx/include -std=c++11 -stdlib=libc++'" % llvm_srcdir,
             "../%s" % llvm_srcdir]
 
     # Note: ShellCommand does not pass the params with special symbols correctly.