672388d4f7
Two wrapper scripts that find git and svn using the ENV variables we support and then searching through the PATH and looking inside Xcode.app if necessary. Now just calling git or svn in Homebrew code will find and exec the right tool and we can stop fussing. Apologies to @adamv who is probably unimpressed that the cmds directory has non-commands in it now. If it's consolation these are temporary pending some more work on superenv whereby some more directories are created under the superenv root.
47 lines
1.3 KiB
Ruby
47 lines
1.3 KiB
Ruby
require 'superenv'
|
|
require 'hardware'
|
|
|
|
module Homebrew extend self
|
|
def __env
|
|
if superenv?
|
|
ENV.deps = ARGV.formulae.map(&:name) unless ARGV.named.empty?
|
|
end
|
|
ENV.setup_build_environment
|
|
ENV.universal_binary if ARGV.build_universal?
|
|
if $stdout.tty?
|
|
dump_build_env ENV
|
|
else
|
|
keys = build_env_keys(ENV) << 'HOMEBREW_BREW_FILE' << 'HOMEBREW_SDKROOT'
|
|
keys.each do |key|
|
|
puts "export #{key}=\"#{ENV[key]}\""
|
|
end
|
|
end
|
|
end
|
|
|
|
def build_env_keys env
|
|
%w[ CC CXX LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS SDKROOT
|
|
CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_FRAMEWORK_PATH MAKEFLAGS
|
|
MACOSX_DEPLOYMENT_TARGET PKG_CONFIG_PATH HOMEBREW_BUILD_FROM_SOURCE
|
|
HOMEBREW_DEBUG HOMEBREW_MAKE_JOBS HOMEBREW_VERBOSE HOMEBREW_USE_CLANG
|
|
HOMEBREW_USE_GCC HOMEBREW_USE_LLVM HOMEBREW_SVN HOMEBREW_GIT
|
|
MAKE GIT CPP
|
|
ACLOCAL_PATH OBJC PATH ].select{ |key| env[key] }
|
|
end
|
|
|
|
def dump_build_env env
|
|
build_env_keys(env).each do |key|
|
|
value = env[key]
|
|
print "#{key}: #{value}"
|
|
case key when 'CC', 'CXX', 'LD'
|
|
if value =~ %r{/usr/bin/xcrun (.*)}
|
|
path = `/usr/bin/xcrun -find #{$1}`
|
|
print " => #{path}"
|
|
elsif File.symlink? value
|
|
print " => #{Pathname.new(value).realpath}"
|
|
end
|
|
end
|
|
puts
|
|
end
|
|
end
|
|
end
|