[PATCH] D31486: libc++ testing: allow to provide a path for `use_system_cxx_lib`

[Mehdi AMINI via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL299053: libc++ testing: allow to provide a path for `use_system_cxx_lib` (authored by mehdi_amini).

Changed prior to commit:
  https://reviews.llvm.org/D31486?vs=93432&id=93444#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D31486

Files:
  libcxx/trunk/utils/libcxx/test/config.py
  libcxx/trunk/utils/libcxx/test/target_info.py


Index: libcxx/trunk/utils/libcxx/test/config.py
===================================================================
--- libcxx/trunk/utils/libcxx/test/config.py
+++ libcxx/trunk/utils/libcxx/test/config.py
@@ -273,12 +273,16 @@
         # the locally built one; the former mode is useful for testing ABI
         # compatibility between the current headers and a shipping dynamic
         # library.
-        self.use_system_cxx_lib = self.get_lit_bool('use_system_cxx_lib')
-        if self.use_system_cxx_lib is None:
-            # Default to testing against the locally built libc++ library.
+        # Default to testing against the locally built libc++ library.
+        self.use_system_cxx_lib = self.get_lit_conf('use_system_cxx_lib')
+        if self.use_system_cxx_lib == 'true':
+            self.use_system_cxx_lib = True
+        elif self.use_system_cxx_lib == 'false':
             self.use_system_cxx_lib = False
-            self.lit_config.note(
-                "inferred use_system_cxx_lib as: %r" % self.use_system_cxx_lib)
+        else:
+            assert os.path.isdir(self.use_system_cxx_lib)
+        self.lit_config.note(
+            "inferred use_system_cxx_lib as: %r" % self.use_system_cxx_lib)
 
     def configure_cxx_stdlib_under_test(self):
         self.cxx_stdlib_under_test = self.get_lit_conf(
@@ -686,6 +690,13 @@
                                             self.cxx_runtime_root]
                 elif self.is_windows and self.link_shared:
                     self.add_path(self.exec_env, self.cxx_runtime_root)
+        elif os.path.isdir(str(self.use_system_cxx_lib)):
+            self.cxx.link_flags += ['-L' + self.use_system_cxx_lib]
+            if not self.is_windows:
+                self.cxx.link_flags += ['-Wl,-rpath,' +
+                                        self.use_system_cxx_lib]
+            if self.is_windows and self.link_shared:
+                self.add_path(self.cxx.compile_env, self.use_system_cxx_lib)
 
     def configure_link_flags_abi_library_path(self):
         # Configure ABI library paths.
Index: libcxx/trunk/utils/libcxx/test/target_info.py
===================================================================
--- libcxx/trunk/utils/libcxx/test/target_info.py
+++ libcxx/trunk/utils/libcxx/test/target_info.py
@@ -142,6 +142,8 @@
         library_paths = []
         # Configure the library path for libc++
         if self.full_config.use_system_cxx_lib:
+            if (os.path.isdir(str(self.full_config.use_system_cxx_lib))):
+                library_paths += [self.full_config.use_system_cxx_lib]
             pass
         elif self.full_config.cxx_runtime_root:
             library_paths += [self.full_config.cxx_runtime_root]


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D31486.93444.patch
Type: text/x-patch
Size: 2719 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170330/5320d178/attachment-0001.bin>