[zorg] r188966 - Patch by Rick Foos!

[Galina Kistanova]

Author: gkistanova
Date: Wed Aug 21 19:09:17 2013
New Revision: 188966

URL: http://llvm.org/viewvc/llvm-project?rev=188966&view=rev
Log:
Patch by Rick Foos!
Changed the clang-hexagon-elf builder to correctly use triple, build, and host configure options.
Removed obsolete options (--without-llvmgcc --without-llvmgxx) from the clang builder.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.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=188966&r1=188965&r2=188966&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Aug 21 19:09:17 2013
@@ -366,12 +366,12 @@ def _get_clang_builders():
         {'name' : "clang-hexagon-elf",
          'slavenames' :["hexagon-build-02"],
          'builddir' :"clang-hexagon-elf",
-         'factory' : ClangBuilder.getClangBuildFactory(triple='hexagon-unknown-elf',
-                                                       stage1_config='Release+Asserts',
-                                                       extra_configure_args=['--build=x86_64-linux-gnu',
-                                                                             '--host=x86_64-linux-gnu',
-                                                                             '--target=hexagon-unknown-elf',
-                                                                             '--enable-targets=hexagon'])},
+         'factory' : ClangBuilder.getClangBuildFactory(
+                     triple='x86_64-linux-gnu',
+                     stage1_config='Release+Asserts',
+                     extra_configure_args=['--enable-shared',
+                                           '--target=hexagon-unknown-elf',
+                                           '--enable-targets=hexagon'])},
         ]
 
 # Offline.

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=188966&r1=188965&r2=188966&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed Aug 21 19:09:17 2013
@@ -157,8 +157,7 @@ def getClangBuildFactory(
     if triple:
         base_configure_args += ['--build=%s' % triple,
                                 '--host=%s' % triple]
-    args = base_configure_args + ["--without-llvmgcc", "--without-llvmgxx"]
-    args.append(WithProperties("--prefix=%%(builddir)s/%s" % llvm_1_installdir))
+    args = base_configure_args + [WithProperties("--prefix=%%(builddir)s/%s" % llvm_1_installdir)]
     args += builders_util.getConfigArgs(stage1_config)
     if not clean:
         f.addStep(SetProperty(name="Makefile_isready",
@@ -291,8 +290,7 @@ def getClangBuildFactory(
                                env=merged_env))
 
     # Configure llvm (stage 2).
-    args = base_configure_args + ["--without-llvmgcc", "--without-llvmgxx"]
-    args.append(WithProperties("--prefix=%(builddir)s/" + llvm_2_installdir))
+    args = base_configure_args + [WithProperties("--prefix=%(builddir)s/" + llvm_2_installdir)]
     args += builders_util.getConfigArgs(stage2_config)
     local_env = dict(merged_env)
     local_env.update({
@@ -738,8 +736,7 @@ def phasedClang(config_options, is_boots
     # Construct the configure arguments.
     configure_args = ['../llvm/configure']
     configure_args.extend(config_options)
-    configure_args.extend(['--disable-bindings', '--with-llvmcc=clang',
-                           '--without-llvmgcc', '--without-llvmgxx',
+    configure_args.extend(['--disable-bindings',
                            '--enable-keep-symbols'])
     configure_args.append(
         WithProperties('--prefix=%(builddir)s/clang-install'))