Skip to content

Commit

Permalink
Recommit r287403 (reverted in r287804): [lit] When setting SDKROOT on…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
kubamracek committed Dec 1, 2016
1 parent 36dece4 commit 0be1dd2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion utils/lit/lit/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 0be1dd2

Please sign in to comment.