From bf4808439f10d270b34cdb82765b74cecc1be191 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Thu, 8 Aug 2019 12:43:04 +0000 Subject: [pstl] Add a __pstl_config_site header to record the CMake configuration This commit adds a __pstl_config_site header that contains the value of macros specified at CMake configuration time. It works similarly to libc++'s __config_site header, except we always include it as a separate file instead of concatenating it to the main configuration header. It is necessary to thread the includes for that header into libc++'s lit configuration, otherwise we'd be requiring an installation step prior to running the test suite. llvm-svn: 368284 --- libcxx/utils/libcxx/test/config.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libcxx/utils') 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 -- cgit v1.2.3