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

Set DEVELOPER_DIR; Fixes bad xcode-select path

Browse Source 
In cases where the xcode-select -print-path is '/' xcrun still hangs indefinitely, setting DEVELOPER_DIR to something (preferably the Xcode path) fixes that. So let's.
This commit is contained in:
Max Howell 2012-09-23 20:57:41 -04:00
parent 7aa38b5d03
commit a0df6180b7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/superenv.rb
View File

@ -16,7 +16,6 @@ def superbin
end end
def superenv? def superenv?
not MacOS::Xcode.bad_xcode_select_path? and # because xcrun won't work
not MacOS::Xcode.folder.nil? and # because xcrun won't work not MacOS::Xcode.folder.nil? and # because xcrun won't work
superbin and superbin.directory? and superbin and superbin.directory? and
not ARGV.include? "--env=std" not ARGV.include? "--env=std"
@ -55,6 +54,7 @@ class << ENV
ENV['CMAKE_LIBRARY_PATH'] = determine_cmake_library_path ENV['CMAKE_LIBRARY_PATH'] = determine_cmake_library_path
ENV['ACLOCAL_PATH'] = determine_aclocal_path ENV['ACLOCAL_PATH'] = determine_aclocal_path
ENV['VERBOSE'] = '1' if ARGV.verbose? ENV['VERBOSE'] = '1' if ARGV.verbose?
ENV['DEVELOPER_DIR'] = determine_developer_dir
end end
def check def check
@ -179,6 +179,15 @@ class << ENV
s s
end end
def determine_developer_dir
# If Xcode path is fucked 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 "/".
if MacOS::Xcode.bad_xcode_select_path?
(Xcode.prefix || HOMEBREW_PREFIX).to_s
end
end
public public
### NO LONGER NECESSARY OR NO LONGER SUPPORTED ### NO LONGER NECESSARY OR NO LONGER SUPPORTED