aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorilovezfs2016-03-23 04:34:21 -0700
committerXu Cheng2016-03-31 13:16:50 +0800
commit45e138ffc6059570421dc203c2e69ba5214cdfaa (patch)
tree9136d7018481dbc5308baf8ce03191cd0026dbcb /Library/Homebrew/extend
parent9bbaaca98c2ba09fd2154e439466ab895270f04b (diff)
downloadbrew-45e138ffc6059570421dc203c2e69ba5214cdfaa.tar.bz2
Xcode 7 MACOSX_DEPLOYMENT_TARGET and SDK fixes
SDK 10.10 isn't something that exists for Xcode 7, so stop looking for it and rely on MACOSX_DEPLOYMENT_TARGET instead. See PR Homebrew/homebrew#50137 Yosemite build failure Closes Homebrew/homebrew#50355. Signed-off-by: ilovezfs <ilovezfs@icloud.com>
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/ENV/super.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index e4eb86cdf..747a76956 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -67,7 +67,7 @@ module Superenv
self["HOMEBREW_INCLUDE_PATHS"] = determine_include_paths
self["HOMEBREW_LIBRARY_PATHS"] = determine_library_paths
- if MacOS::Xcode.without_clt?
+ if MacOS::Xcode.without_clt? || (MacOS::Xcode.installed? && MacOS::Xcode.version.to_i >= 7)
self["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version.to_s
self["SDKROOT"] = MacOS.sdk_path
end