[libcxx-commits] [libcxx] b0ae533 - [libcxx] Make sure we pass -isysroot when linking AND when compiling

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-09-10T12:24:11-04:00
New Revision: b0ae5332dc2be682564d6fbcc9755c6ae5120086

URL: https://github.com/llvm/llvm-project/commit/b0ae5332dc2be682564d6fbcc9755c6ae5120086
DIFF: https://github.com/llvm/llvm-project/commit/b0ae5332dc2be682564d6fbcc9755c6ae5120086.diff

LOG: [libcxx] Make sure we pass -isysroot when linking AND when compiling

Added: 
    

Modified: 
    libcxx/utils/libcxx/test/config.py
    libcxx/utils/libcxx/test/target_info.py

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py
index c8bfdda91463..086db1d7f560 100644
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -289,6 +289,7 @@ def configure_default_compile_flags(self):
         # Configure include paths
         self.configure_compile_flags_header_includes()
         self.target_info.add_cxx_compile_flags(self.cxx.compile_flags)
+        self.target_info.add_cxx_flags(self.cxx.flags)
         # Configure feature flags.
         enable_32bit = self.get_lit_bool('enable_32bit', False)
         if enable_32bit:

diff  --git a/libcxx/utils/libcxx/test/target_info.py b/libcxx/utils/libcxx/test/target_info.py
index 4f19d60a1a87..130d5600ed17 100644
--- a/libcxx/utils/libcxx/test/target_info.py
+++ b/libcxx/utils/libcxx/test/target_info.py
@@ -30,6 +30,7 @@ def is_windows(self):
     def is_darwin(self):
         return self.platform() == 'darwin'
 
+    def add_cxx_flags(self, flags): pass
     def add_cxx_compile_flags(self, flags): pass
     def add_cxx_link_flags(self, flags): pass
     def allow_cxxabi_link(self): return True
@@ -73,7 +74,7 @@ def get_sdk_version(self, name):
 
         return re.sub(r'.*/[^0-9]+([0-9.]+)\.sdk', r'\1', out)
 
-    def add_cxx_compile_flags(self, flags):
+    def add_cxx_flags(self, flags):
         out, err, exit_code = executeCommand(['xcrun', '--show-sdk-path'])
         if exit_code != 0:
             self.full_config.lit_config.warning("Could not determine macOS SDK path! stderr was " + err)