Author: ericwf Date: Wed Oct 14 14:21:38 2015 New Revision: 250316 URL: http://llvm.org/viewvc/llvm-project?rev=250316&view=rev Log: Fix LIBCXXABI_HAS_NO_THREADS configuration.
Modified: libcxxabi/trunk/test/libcxxabi/test/config.py Modified: libcxxabi/trunk/test/libcxxabi/test/config.py URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/libcxxabi/test/config.py?rev=250316&r1=250315&r2=250316&view=diff ============================================================================== --- libcxxabi/trunk/test/libcxxabi/test/config.py (original) +++ libcxxabi/trunk/test/libcxxabi/test/config.py Wed Oct 14 14:21:38 2015 @@ -28,8 +28,10 @@ class Configuration(LibcxxConfiguration) def configure_compile_flags(self): self.cxx.compile_flags += ['-DLIBCXXABI_NO_TIMER'] self.cxx.compile_flags += ['-funwind-tables'] - super(Configuration, self).configure_compile_flags() - + if not self.get_lit_bool('enable_threads', True): + self.cxx.compile_flags += ['-DLIBCXXABI_HAS_NO_THREADS=1'] + super(Configuration, self).configure_compile_flags() + def configure_compile_flags_header_includes(self): self.configure_config_site_header() cxx_headers = self.get_lit_conf( @@ -54,12 +56,6 @@ class Configuration(LibcxxConfiguration) def configure_compile_flags_rtti(self): pass - def configure_compile_flags_no_threads(self): - self.cxx.compile_flags += ['-DLIBCXXABI_HAS_NO_THREADS=1'] - - def configure_compile_flags_no_monotonic_clock(self): - pass - # TODO(ericwf): Remove this. This is a hack for OS X. # libc++ *should* export all of the symbols found in libc++abi on OS X. # For this reason LibcxxConfiguration will not link libc++abi in OS X. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits