[PATCH] D40609: [PATCH 3/3] [zorg] Remove obsolete workarounds for Arm/AArch64 libcxx bots

[Maxim Kuvyrkov via Phabricator via llvm-commits]

maxim-kuvyrkov updated this revision to Diff 124897.
maxim-kuvyrkov added a comment.

Rebase after https://reviews.llvm.org/D40607 update


https://reviews.llvm.org/D40609

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


Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1359,9 +1359,6 @@
          'builddir': 'libcxx-libcxxabi-libunwind-arm-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            # FIXME: there should be a way to merge autodetected with user-defined linker flags
-            # See: libcxxabi/test/lit.cfg
-            lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
             cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_C_COMPILER': 'clang',
@@ -1376,9 +1373,6 @@
          'builddir': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            # FIXME: there should be a way to merge autodetected with user-defined linker flags
-            # See: libcxxabi/test/lit.cfg
-            lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
             cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_C_COMPILER': 'clang',
@@ -1396,9 +1390,6 @@
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            # FIXME: there should be a way to merge autodetected with user-defined linker flags
-            # See: libcxxabi/test/lit.cfg
-            lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
             cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_C_COMPILER': 'clang',
@@ -1413,9 +1404,6 @@
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            # FIXME: there should be a way to merge autodetected with user-defined linker flags
-            # See: libcxxabi/test/lit.cfg
-            lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
             cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_C_COMPILER': 'clang',


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D40609.124897.patch
Type: text/x-patch
Size: 2955 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171130/f0a17312/attachment.bin>