[zorg] r275088 - [libcxx] Partially revert r274747.

[Asiri Rathnayake via llvm-commits]

Author: asiri
Date: Mon Jul 11 14:13:26 2016
New Revision: 275088

URL: http://llvm.org/viewvc/llvm-project?rev=275088&view=rev
Log:
[libcxx] Partially revert r274747.

The re-ordering of the libraries in the linker invocation seems to cause one
test failure. Not entirely clear how this change is affecting the test case.
Reverting for the moment - I don't have this bots configuration for further
investigation at the moment.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.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=275088&r1=275087&r2=275088&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Jul 11 14:13:26 2016
@@ -984,7 +984,7 @@ def _get_libcxx_builders():
             env={'CC': 'clang', 'CXX': 'clang++'},
             # 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 -lpthread -lunwind -ldl -lc -lm -L/opt/llvm/lib/clang/3.6.0/lib/linux -lclang_rt.builtins-arm"'},
+            lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.6.0/lib/linux -lclang_rt.builtins-arm"'},
             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a15',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15'})},
@@ -997,7 +997,7 @@ def _get_libcxx_builders():
             env={'CC': 'clang', 'CXX': 'clang++'},
             # 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 -lpthread -lunwind -ldl -lc -lm -L/opt/llvm/lib/clang/3.6.0/lib/linux -lclang_rt.builtins-arm"'},
+            lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.6.0/lib/linux -lclang_rt.builtins-arm"'},
             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a15',