diff options
Diffstat (limited to 'test/libcxx/test/config.py')
| -rw-r--r-- | test/libcxx/test/config.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/libcxx/test/config.py b/test/libcxx/test/config.py index 4551845104d2..dd90e7a37430 100644 --- a/test/libcxx/test/config.py +++ b/test/libcxx/test/config.py @@ -579,10 +579,6 @@ class Configuration(object): self.cxx.link_flags += [abs_path] else: self.cxx.link_flags += ['-lc++'] - # This needs to come after -lc++ as we want its unresolved thread-api symbols - # to be picked up from this one. - if self.get_lit_bool('libcxx_external_thread_api', default=False): - self.cxx.link_flags += ['-lc++external_threads'] def configure_link_flags_abi_library(self): cxx_abi = self.get_lit_conf('cxx_abi', 'libcxxabi') @@ -604,13 +600,15 @@ class Configuration(object): self.cxx.link_flags += ['-lc++abi'] elif cxx_abi == 'libcxxrt': self.cxx.link_flags += ['-lcxxrt'] - elif cxx_abi == 'none': + elif cxx_abi == 'none' or cxx_abi == 'default': pass else: self.lit_config.fatal( 'C++ ABI setting %s unsupported for tests' % cxx_abi) def configure_extra_library_flags(self): + if self.get_lit_bool('cxx_ext_threads', default=False): + self.cxx.link_flags += ['-lc++external_threads'] self.target_info.add_cxx_link_flags(self.cxx.link_flags) def configure_color_diagnostics(self): |