[zorg] r199792 - Reverted r199330 and r199331.

[Galina Kistanova]

Author: gkistanova
Date: Wed Jan 22 01:01:02 2014
New Revision: 199792

URL: http://llvm.org/viewvc/llvm-project?rev=199792&view=rev
Log:
Reverted r199330 and r199331.
We cannot unconditionally require libc++ for all platforms. Some builders build with gcc, some want libstdc++, and such (see http://lab.llvm.org:8011/builders/clang-mergefunc-x86_64-freeBSD9.2/builds/2253 for instance). Please consider defining extra_configure_args for particular builders instead or do this specifically for darwin.

Modified:
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=199792&r1=199791&r2=199792&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed Jan 22 01:01:02 2014
@@ -177,7 +177,6 @@ def getClangBuildFactory(
                                 '--host=%s' % triple]
     args = base_configure_args + [WithProperties("--prefix=%%(builddir)s/%s" % llvm_1_installdir)]
     args += builders_util.getConfigArgs(stage1_config)
-    args.append('--enable-libcpp')
     if not clean:
         f.addStep(SetProperty(name="Makefile_isready",
                               workdir=llvm_1_objdir,
@@ -313,7 +312,6 @@ def getClangBuildFactory(
     # Configure llvm (stage 2).
     args = base_configure_args + [WithProperties("--prefix=%(builddir)s/" + llvm_2_installdir)]
     args += builders_util.getConfigArgs(stage2_config)
-    args.append('--enable-libcpp')
     local_env = dict(merged_env)
     local_env.update({
         'CC'  : WithProperties("%%(builddir)s/%s/bin/clang"   % llvm_1_installdir),
@@ -787,7 +785,6 @@ def phasedClang(config_options, is_boots
     configure_args.extend(config_options)
     configure_args.extend(['--disable-bindings',
                            '--enable-keep-symbols'])
-    configure_args.append('--enable-libcpp')
     configure_args.append(
         WithProperties('--prefix=%(builddir)s/clang-install'))