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

Remove obsolete DEVELOPER_DIR hacks

Browse Source 
These days Homebrew refuses to do anything if the xcode-select path is
busted, so this workaround is unnecessary.
This commit is contained in:
Jack Nagel 2014-04-20 16:33:41 -05:00
parent 749c877f03
commit dd8dc7a380
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/ENV/4.3/xcrun
View File

@ -9,7 +9,7 @@ require "#{dirname}/../libsuperenv"
SUPERBIN = dirname.cleanpath.freeze SUPERBIN = dirname.cleanpath.freeze
# Some build tools are stupid and still set DEVELOPER_DIR to old /Developer # Some build tools are stupid and still set DEVELOPER_DIR to old /Developer
ENV['DEVELOPER_DIR'] = ENV['HOMEBREW_DEVELOPER_DIR'] ENV.delete "DEVELOPER_DIR"
exec "/usr/bin/xcrun", *ARGV if ARGV.empty? or ARGV[0][0..0] == '-' exec "/usr/bin/xcrun", *ARGV if ARGV.empty? or ARGV[0][0..0] == '-'
if File.exist?("/usr/bin/#{ARGV.first}") if File.exist?("/usr/bin/#{ARGV.first}")
@ -23,9 +23,7 @@ end
arg0 = ARGV.shift arg0 = ARGV.shift
try `/usr/bin/xcrun --find #{arg0} 2>/dev/null`.chomp try `/usr/bin/xcrun --find #{arg0} 2>/dev/null`.chomp
# Nuts, Xcode is not setup properly or something. Try to find the tools anyway!
try "#{ENV['HOMEBREW_DEVELOPER_DIR']}/usr/bin/#{arg0}"
try "#{ENV['HOMEBREW_DEVELOPER_DIR']}/Toolchains/XcodeDefault.xctoolchain/usr/bin/#{arg0}"
# xcrun won't always be able to find Homebrew's apple-gcc42, # xcrun won't always be able to find Homebrew's apple-gcc42,
# even when it's in the PATH # even when it's in the PATH
ENV['PATH'].split(':').each do |p| ENV['PATH'].split(':').each do |p|

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

@ -46,7 +46,7 @@ module Superenv
def reset def reset
%w{CC CXX OBJC OBJCXX CPP MAKE LD LDSHARED %w{CC CXX OBJC OBJCXX CPP MAKE LD LDSHARED
CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS LDFLAGS CPPFLAGS CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS LDFLAGS CPPFLAGS
MACOSX_DEPLOYMENT_TARGET SDKROOT MACOSX_DEPLOYMENT_TARGET SDKROOT DEVELOPER_DIR
CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_FRAMEWORK_PATH CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_FRAMEWORK_PATH
CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH OBJC_INCLUDE_PATH}. CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH OBJC_INCLUDE_PATH}.
each{ |x| delete(x) } each{ |x| delete(x) }
@ -65,7 +65,6 @@ module Superenv
self.cc = self['HOMEBREW_CC'] = determine_cc self.cc = self['HOMEBREW_CC'] = determine_cc
self.cxx = self['HOMEBREW_CXX'] = determine_cxx self.cxx = self['HOMEBREW_CXX'] = determine_cxx
validate_cc!(formula) unless formula.nil? validate_cc!(formula) unless formula.nil?
self['DEVELOPER_DIR'] = determine_developer_dir
self['MAKEFLAGS'] ||= "-j#{determine_make_jobs}" self['MAKEFLAGS'] ||= "-j#{determine_make_jobs}"
self['PATH'] = determine_path self['PATH'] = determine_path
self['PKG_CONFIG_PATH'] = determine_pkg_config_path self['PKG_CONFIG_PATH'] = determine_pkg_config_path
@ -76,7 +75,6 @@ module Superenv
self['HOMEBREW_PREFIX'] = HOMEBREW_PREFIX self['HOMEBREW_PREFIX'] = HOMEBREW_PREFIX
self['HOMEBREW_TEMP'] = HOMEBREW_TEMP self['HOMEBREW_TEMP'] = HOMEBREW_TEMP
self['HOMEBREW_SDKROOT'] = "#{MacOS.sdk_path}" if MacOS::Xcode.without_clt? self['HOMEBREW_SDKROOT'] = "#{MacOS.sdk_path}" if MacOS::Xcode.without_clt?
self['HOMEBREW_DEVELOPER_DIR'] = determine_developer_dir # used by our xcrun shim
self['HOMEBREW_OPTFLAGS'] = determine_optflags self['HOMEBREW_OPTFLAGS'] = determine_optflags
self['CMAKE_PREFIX_PATH'] = determine_cmake_prefix_path self['CMAKE_PREFIX_PATH'] = determine_cmake_prefix_path
self['CMAKE_FRAMEWORK_PATH'] = determine_cmake_frameworks_path self['CMAKE_FRAMEWORK_PATH'] = determine_cmake_frameworks_path
@ -224,13 +222,6 @@ module Superenv
s s
end end
def determine_developer_dir
# If Xcode path is broken then this is basically a fix. In the case where
# nothing is valid, it still fixes most usage to supply a valid path that
# is not "/".
MacOS::Xcode.prefix || self['DEVELOPER_DIR']
end
public public
def deparallelize def deparallelize