[libcxx] r255560 - Update how libc++/libc++abi link the tests. Follow up on r255559.

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Mon Dec 14 16:24:19 2015
New Revision: 255560

URL: http://llvm.org/viewvc/llvm-project?rev=255560&view=rev
Log:
Update how libc++/libc++abi link the tests. Follow up on r255559.

Modified:
    libcxx/trunk/test/libcxx/test/config.py

Modified: libcxx/trunk/test/libcxx/test/config.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/config.py?rev=255560&r1=255559&r2=255560&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/test/config.py (original)
+++ libcxx/trunk/test/libcxx/test/config.py Mon Dec 14 16:24:19 2015
@@ -572,15 +572,16 @@ class Configuration(object):
         if target_platform == 'darwin':
             self.cxx.link_flags += ['-lSystem']
         elif target_platform == 'linux':
+            self.cxx.link_flags += ['-lm']
             if not llvm_unwinder:
-                self.cxx.link_flags += ['-lgcc_eh']
-            self.cxx.link_flags += ['-lc', '-lm']
+                self.cxx.link_flags += ['-lgcc_s', '-lgcc']
             if enable_threads:
                 self.cxx.link_flags += ['-lpthread']
+            self.cxx.link_flags += ['-lc']
             if llvm_unwinder:
                 self.cxx.link_flags += ['-lunwind', '-ldl']
             else:
-                self.cxx.link_flags += ['-lgcc_s']
+                self.cxx.link_flags += ['-lgcc_s', '-lgcc']
         elif target_platform.startswith('freebsd'):
             self.cxx.link_flags += ['-lc', '-lm', '-lpthread', '-lgcc_s', '-lcxxrt']
         else: