admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Always use stub tools in /usr/bin on 10.9

Browse Source
This commit is contained in:
Jack Nagel 2014-05-08 17:10:08 -05:00
parent f0f1cf2024
commit 089af6627a
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/ENV/4.3/xcrun
View File

@ -15,6 +15,7 @@ arg0 = ARGV.shift
exe = "/usr/bin/#{arg0}" exe = "/usr/bin/#{arg0}"
if File.executable?(exe) if File.executable?(exe)
exec(exe, *ARGV) if ENV["HOMEBREW_PREFER_CLT_PROXIES"]
sdkroot = ENV["HOMEBREW_SDKROOT"] sdkroot = ENV["HOMEBREW_SDKROOT"]
exec(exe, *ARGV) unless sdkroot && File.directory?(sdkroot) exec(exe, *ARGV) unless sdkroot && File.directory?(sdkroot)
end end

4
Library/Homebrew/extend/ENV/super.rb
View File

@ -83,6 +83,10 @@ module Superenv
self['ACLOCAL_PATH'] = determine_aclocal_path self['ACLOCAL_PATH'] = determine_aclocal_path
self['M4'] = MacOS.locate("m4") if deps.include? "autoconf" self['M4'] = MacOS.locate("m4") if deps.include? "autoconf"
# On 10.9, the tools in /usr/bin proxy to the active developer directory.
# This means we can use them for any combination of CLT and Xcode.
self["HOMEBREW_PREFER_CLT_PROXIES"] = "1" if MacOS.version == "10.9"
# The HOMEBREW_CCCFG ENV variable is used by the ENV/cc tool to control # The HOMEBREW_CCCFG ENV variable is used by the ENV/cc tool to control
# compiler flag stripping. It consists of a string of characters which act # compiler flag stripping. It consists of a string of characters which act
# as flags. Some of these flags are mutually exclusive. # as flags. Some of these flags are mutually exclusive.