[PATCH] D63495: [zorg] Add solaris11-amd64, solaris11-sparcv9 builders

[Rainer Orth via Phabricator via llvm-commits]

ro updated this revision to Diff 205526.
ro added a comment.

Further testing in the exact buildbot user environment revealed that I'd forgotten one
crucial option: clang calls the linker with Solaris ld-only options.  If GNU ld happens to
be earlier in PATH at link time, this breaks the build.

Until I've figured out how to either pre-configure Solaris ld differently or make clang
work with gld, I'm forcing the right linker.


Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D63495/new/

https://reviews.llvm.org/D63495

Files:
  buildbot/osuosl/master/config/builders.py
  buildbot/osuosl/master/config/slaves.py


Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -220,4 +220,8 @@
         # Ubuntu 18.04.2 LTS x86_64 Intel(R) Xeon(R) Gold CPU @ 2.1GHz, 128GB RAM
         create_slave("as-builder-4", properties={'jobs': 64}, max_builds=1),
 
+        # Solaris 11
+        create_slave("solaris11-amd64", properties={'jobs' : 8}, max_builds=1),
+        create_slave("solaris11-sparcv9", properties={'jobs' : 8}, max_builds=1),
+
         ]
Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -745,6 +745,25 @@
                ),
          'category': 'clang'},
 
+        {'name' : "clang-solaris11-amd64",
+         'slavenames' : ["solaris11-amd64"],
+         'builddir' : "clang-solaris11-amd64",
+         'factory': ClangBuilder.getClangCMakeBuildFactory(
+		       clean=False,
+		       checkout_lld=False,
+                       extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
+					 '-DLLVM_TARGETS_TO_BUILD=X86',
+                                         '-DCLANG_DEFAULT_LINKER=/usr/bin/ld'])},
+
+        {'name' : "clang-solaris11-sparcv9",
+         'slavenames' : ["solaris11-sparcv9"],
+         'builddir' : "clang-solaris11-sparcv9",
+         'factory': ClangBuilder.getClangCMakeBuildFactory(
+		       clean=False,
+		       checkout_lld=False,
+                       extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
+					 '-DLLVM_TARGETS_TO_BUILD=Sparc',
+                                         '-DCLANG_DEFAULT_LINKER=/usr/bin/ld'])},
     ]
 
 # Polly builders.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D63495.205526.patch
Type: text/x-patch
Size: 1798 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190619/e0410ccf/attachment.bin>