From 0be1dd284d8d25b1f65e5e695937acb92000d30f Mon Sep 17 00:00:00 2001 From: Kuba Mracek Date: Thu, 1 Dec 2016 17:45:22 +0000 Subject: [PATCH] Recommit r287403 (reverted in r287804): [lit] When setting SDKROOT on Darwin, use '--sdk macosx' to find the right SDK path. 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 --- utils/lit/lit/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/lit/lit/util.py b/utils/lit/lit/util.py index 609011b1972..be37998c6f1 100644 --- 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() -- 2.11.0