Recommit r287403 (reverted in r287804): [lit] When setting SDKROOT on Darwin, use...

This shouls now be safe and not break any more bots.  It's strictly better to use '--sdk macosx', otherwise xcrun can return weird things for example when you have Command Line Tools or the SDK installed into '/'.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@288385 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/lit/lit/util.py b/utils/lit/lit/util.py
index 609011b..be37998 100644 (file)
--- a/utils/lit/lit/util.py
+++ b/utils/lit/lit/util.py
@@ -251,7 +251,7 @@ def usePlatformSdkOnDarwin(config, lit_config):
     # default system root path.
     if 'darwin' in config.target_triple:
         try:
-            cmd = subprocess.Popen(['xcrun', '--show-sdk-path'],
+            cmd = subprocess.Popen(['xcrun', '--show-sdk-path', '--sdk', 'macosx'],
                                    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             out, err = cmd.communicate()
             out = out.strip()