[zorg] r206315 - Changed environment for lld-x86_64-freeBSD builder.
Galina Kistanova
gkistanova at gmail.com
Tue Apr 15 12:19:42 PDT 2014
Author: gkistanova
Date: Tue Apr 15 14:19:41 2014
New Revision: 206315
URL: http://llvm.org/viewvc/llvm-project?rev=206315&view=rev
Log:
Changed environment for lld-x86_64-freeBSD builder.
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/zorg/buildbot/builders/LLDBuilder.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=206315&r1=206314&r2=206315&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Apr 15 14:19:41 2014
@@ -575,7 +575,7 @@ def _get_lld_builders():
'slavenames' :["as-bldslv5"],
'builddir':"lld-x86_64-freeBSD",
'factory': LLDBuilder.getLLDBuildFactory(jobs=32,
- env={'CXXFLAGS' : "-stdlib=libc++"}),
+ env={'CXXFLAGS' : "-std=c++11 -stdlib=libc++"}),
'category' : 'lld'},
]
Modified: zorg/trunk/zorg/buildbot/builders/LLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBuilder.py?rev=206315&r1=206314&r2=206315&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBuilder.py Tue Apr 15 14:19:41 2014
@@ -13,7 +13,7 @@ def getLLDBuildFactory(
# Prepare environmental variables. Set here all env we want everywhere.
merged_env = {
- 'CC' : "clang",
+ 'CC' : "clang",
'CXX' : "clang++",
'TERM' : 'dumb' # Be cautious and disable color output from all tools.
}
@@ -62,6 +62,7 @@ def getLLDBuildFactory(
"-DCMAKE_BUILD_TYPE=Release",
"-DLLVM_ENABLE_CXX11=ON",
"-DLLVM_ENABLE_WERROR=ON",
+ "-DCMAKE_EXE_LINKER_FLAGS=-lcxxrt",
"../%s" % llvm_srcdir]
# Note: ShellCommand does not pass the params with special symbols right.
# The " ".join is a workaround for this bug.
More information about the llvm-commits
mailing list