<div dir="ltr">Do we need to do with while building libc++ as well? Also please reuse lit.util.capture or lit.util.executeCommand instead of subprocess.<div><br></div><div>/Eric</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Oct 11, 2015 at 6:49 PM, Chris Bieneman via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: cbieneman<br>
Date: Sun Oct 11 19:49:56 2015<br>
New Revision: 250003<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=250003&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=250003&view=rev</a><br>
Log:<br>
[Darwin] Need to add -isysroot on OS X otherwise the tests will fail if you don't have the command line tools package installed.<br>
<br>
This mirrors how other LLVM suites are configured for running on OS X.<br>
<br>
Modified:<br>
    libcxx/trunk/test/libcxx/test/config.py<br>
<br>
Modified: libcxx/trunk/test/libcxx/test/config.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/config.py?rev=250003&r1=250002&r2=250003&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/config.py?rev=250003&r1=250002&r2=250003&view=diff</a><br>
==============================================================================<br>
--- libcxx/trunk/test/libcxx/test/config.py (original)<br>
+++ libcxx/trunk/test/libcxx/test/config.py Sun Oct 11 19:49:56 2015<br>
@@ -6,6 +6,7 @@ import pkgutil<br>
 import re<br>
 import shlex<br>
 import sys<br>
+import subprocess<br>
<br>
 import lit.Test  # pylint: disable=import-error,no-name-in-module<br>
 import lit.util  # pylint: disable=import-error,no-name-in-module<br>
@@ -42,6 +43,24 @@ def loadSiteConfig(lit_config, config, p<br>
         ld_fn(config, site_cfg)<br>
         lit_config.load_config = ld_fn<br>
<br>
+def getSysrootFlagsOnDarwin(config, lit_config):<br>
+    # On Darwin, support relocatable SDKs by providing Clang with a<br>
+    # default system root path.<br>
+    if 'darwin' in config.target_triple:<br>
+        try:<br>
+            cmd = subprocess.Popen(['xcrun', '--show-sdk-path'],<br>
+                                   stdout=subprocess.PIPE, stderr=subprocess.PIPE)<br>
+            out, err = cmd.communicate()<br>
+            out = out.strip()<br>
+            res = cmd.wait()<br>
+        except OSError:<br>
+            res = -1<br>
+        if res == 0 and out:<br>
+            sdk_path = out<br>
+            lit_config.note('using SDKROOT: %r' % sdk_path)<br>
+            return ["-isysroot", sdk_path]<br>
+    return []<br>
+<br>
<br>
 class Configuration(object):<br>
     # pylint: disable=redefined-outer-name<br>
@@ -339,6 +358,8 @@ class Configuration(object):<br>
         # Configure extra flags<br>
         compile_flags_str = self.get_lit_conf('compile_flags', '')<br>
         self.cxx.compile_flags += shlex.split(compile_flags_str)<br>
+        sysroot_flags = getSysrootFlagsOnDarwin(self.config, self.lit_config)<br>
+        self.cxx.compile_flags.extend(sysroot_flags)<br>
<br>
     def configure_default_compile_flags(self):<br>
         # Try and get the std version from the command line. Fall back to<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>