Split out config_site logic so libc++abi can use it

llvm-svn: 250312

1 files changed, 15 insertions, 12 deletions

diff --git a/libcxx/test/libcxx/test/config.py b/libcxx/test/libcxx/test/config.py
index 419a86605b8..07e4bdc0074 100644
--- a/libcxx/test/libcxx/test/config.py
+++ b/libcxx/test/libcxx/test/config.py
@@ -414,18 +414,7 @@ class Configuration(object):
         support_path = os.path.join(self.libcxx_src_root, 'test/support')
         self.cxx.compile_flags += ['-I' + support_path]
         self.cxx.compile_flags += ['-include', os.path.join(support_path, 'nasty_macros.hpp')]
-        # Check for a possible __config_site in the build directory. We
-        # use this if it exists.
-        config_site_header = os.path.join(self.libcxx_obj_root, '__config_site')
-        if os.path.isfile(config_site_header):
-            contained_macros = self.parse_config_site_and_add_features(
-                config_site_header)
-            self.lit_config.note('Using __config_site header %s with macros: %r'
-                % (config_site_header, contained_macros))
-            # FIXME: This must come after the call to
-            # 'parse_config_site_and_add_features(...)' in order for it to work.
-            self.cxx.compile_flags += ['-include', config_site_header]
-
+        self.configure_config_site_header()
         libcxx_headers = self.get_lit_conf(
             'libcxx_headers', os.path.join(self.libcxx_src_root, 'include'))
         if not os.path.isdir(libcxx_headers):
@@ -433,6 +422,20 @@ class Configuration(object):
                                   % libcxx_headers)
         self.cxx.compile_flags += ['-I' + libcxx_headers]
 
+    def configure_config_site_header(self):
+        # Check for a possible __config_site in the build directory. We
+        # use this if it exists.
+        config_site_header = os.path.join(self.libcxx_obj_root, '__config_site')
+        if not os.path.isfile(config_site_header):
+            return
+        contained_macros = self.parse_config_site_and_add_features(
+            config_site_header)
+        self.lit_config.note('Using __config_site header %s with macros: %r'
+            % (config_site_header, contained_macros))
+        # FIXME: This must come after the call to
+        # 'parse_config_site_and_add_features(...)' in order for it to work.
+        self.cxx.compile_flags += ['-include', config_site_header]
+
     def parse_config_site_and_add_features(self, header):
         """ parse_config_site_and_add_features - Deduce and add the test
             features that that are implied by the #define's in the __config_site