<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">CMake handles doing it while building. I will update to use lit.util.*<div class=""><br class=""></div><div class="">-Chris</div><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Oct 11, 2015, at 6:04 PM, Eric Fiselier <<a href="mailto:eric@efcs.ca" class="">eric@efcs.ca</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">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 class=""><br class=""></div><div class="">/Eric</div></div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Sun, Oct 11, 2015 at 6:49 PM, Chris Bieneman via cfe-commits <span dir="ltr" class=""><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank" class="">cfe-commits@lists.llvm.org</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: cbieneman<br class="">
Date: Sun Oct 11 19:49:56 2015<br class="">
New Revision: 250003<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=250003&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=250003&view=rev</a><br class="">
Log:<br class="">
[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 class="">
<br class="">
This mirrors how other LLVM suites are configured for running on OS X.<br class="">
<br class="">
Modified:<br class="">
libcxx/trunk/test/libcxx/test/config.py<br class="">
<br class="">
Modified: libcxx/trunk/test/libcxx/test/config.py<br class="">
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" class="">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/config.py?rev=250003&r1=250002&r2=250003&view=diff</a><br class="">
==============================================================================<br class="">
--- libcxx/trunk/test/libcxx/test/config.py (original)<br class="">
+++ libcxx/trunk/test/libcxx/test/config.py Sun Oct 11 19:49:56 2015<br class="">
@@ -6,6 +6,7 @@ import pkgutil<br class="">
import re<br class="">
import shlex<br class="">
import sys<br class="">
+import subprocess<br class="">
<br class="">
import lit.Test # pylint: disable=import-error,no-name-in-module<br class="">
import lit.util # pylint: disable=import-error,no-name-in-module<br class="">
@@ -42,6 +43,24 @@ def loadSiteConfig(lit_config, config, p<br class="">
ld_fn(config, site_cfg)<br class="">
lit_config.load_config = ld_fn<br class="">
<br class="">
+def getSysrootFlagsOnDarwin(config, lit_config):<br class="">
+ # On Darwin, support relocatable SDKs by providing Clang with a<br class="">
+ # default system root path.<br class="">
+ if 'darwin' in config.target_triple:<br class="">
+ try:<br class="">
+ cmd = subprocess.Popen(['xcrun', '--show-sdk-path'],<br class="">
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)<br class="">
+ out, err = cmd.communicate()<br class="">
+ out = out.strip()<br class="">
+ res = cmd.wait()<br class="">
+ except OSError:<br class="">
+ res = -1<br class="">
+ if res == 0 and out:<br class="">
+ sdk_path = out<br class="">
+ lit_config.note('using SDKROOT: %r' % sdk_path)<br class="">
+ return ["-isysroot", sdk_path]<br class="">
+ return []<br class="">
+<br class="">
<br class="">
class Configuration(object):<br class="">
# pylint: disable=redefined-outer-name<br class="">
@@ -339,6 +358,8 @@ class Configuration(object):<br class="">
# Configure extra flags<br class="">
compile_flags_str = self.get_lit_conf('compile_flags', '')<br class="">
self.cxx.compile_flags += shlex.split(compile_flags_str)<br class="">
+ sysroot_flags = getSysrootFlagsOnDarwin(self.config, self.lit_config)<br class="">
+ self.cxx.compile_flags.extend(sysroot_flags)<br class="">
<br class="">
def configure_default_compile_flags(self):<br class="">
# Try and get the std version from the command line. Fall back to<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
cfe-commits mailing list<br class="">
<a href="mailto:cfe-commits@lists.llvm.org" class="">cfe-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br class="">
</blockquote></div><br class=""></div>
</div></blockquote></div><br class=""></div></body></html>