[PATCH] Zorg, lld build factory: disable -stdlib=libc++ for GNU builds

[Mikael Lyngvig]

See the subject.  Necessary to get the GNU/PowerPC lld builder in the air
(it currently fails).

Index: zorg/buildbot/builders/LLDBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBuilder.py        (revision 196862)
+++ zorg/buildbot/builders/LLDBuilder.py        (working copy)
@@ -57,10 +57,16 @@
                                haltOnFailure=False,
                                description=["create build dir"],
                                workdir="."))
+
+    # Only use -stdlib=libc++ for Clang++, not for GCC.
+    stdlib = ""
+    if env['CXX'].find('clang++') != -1:
+        stdlib = "-stdlib=libc++"
+
     cmakeCommand = [
         "cmake",
         "-DCMAKE_BUILD_TYPE=Release",
-        "-DCMAKE_CXX_FLAGS=\"-Wall -Werror -std=c++11 -stdlib=libc++
-U__STRICT_ANSI__\"",
+        "-DCMAKE_CXX_FLAGS=\"-Wall -Werror -std=c++11 %s
-U__STRICT_ANSI__\"" % stdlib,
         "../%s" % llvm_srcdir]
     # Note: ShellCommand does not pass the params with special symbols
right.
     # The " ".join is a workaround for this bug.


-- Mikael
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20131210/96bf4475/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: zorg-stdlib-selection.patch
Type: application/octet-stream
Size: 993 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20131210/96bf4475/attachment.obj>