diff options
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/test/lit.site.cfg.in | 3 | ||||
| -rw-r--r-- | libcxx/utils/libcxx/test/config.py | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/libcxx/test/lit.site.cfg.in b/libcxx/test/lit.site.cfg.in index b5b390dc4d6..fd3d7d8dac6 100644 --- a/libcxx/test/lit.site.cfg.in +++ b/libcxx/test/lit.site.cfg.in @@ -33,7 +33,8 @@ config.use_libatomic = @LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB@ config.debug_build = @LIBCXX_DEBUG_BUILD@ config.libcxxabi_shared = @LIBCXXABI_ENABLE_SHARED@ config.cxx_ext_threads = @LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY@ -config.pstl_root = "@ParallelSTL_SOURCE_DIR@" if @LIBCXX_ENABLE_PARALLEL_ALGORITHMS@ else None +config.pstl_src_root = "@ParallelSTL_SOURCE_DIR@" if @LIBCXX_ENABLE_PARALLEL_ALGORITHMS@ else None +config.pstl_obj_root = "@ParallelSTL_BINARY_DIR@" if @LIBCXX_ENABLE_PARALLEL_ALGORITHMS@ else None # Let the main config do the real work. config.loaded_site_config = True diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index 09ba9cf806f..e074df3c922 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -582,10 +582,12 @@ class Configuration(object): self.cxx.compile_flags += ['-I' + support_path] # Add includes for the PSTL headers - pstl_root = self.get_lit_conf('pstl_root') - if pstl_root is not None: - self.cxx.compile_flags += ['-I' + os.path.join(pstl_root, 'include')] - self.cxx.compile_flags += ['-I' + os.path.join(pstl_root, 'test')] + pstl_src_root = self.get_lit_conf('pstl_src_root') + pstl_obj_root = self.get_lit_conf('pstl_obj_root') + if pstl_src_root is not None and pstl_obj_root is not None: + self.cxx.compile_flags += ['-I' + os.path.join(pstl_src_root, 'include')] + self.cxx.compile_flags += ['-I' + os.path.join(pstl_obj_root, 'generated_headers')] + self.cxx.compile_flags += ['-I' + os.path.join(pstl_src_root, 'test')] self.config.available_features.add('parallel-algorithms') # FIXME(EricWF): variant_size.pass.cpp requires a slightly larger |
