diff --git a/Library/ENV/libsuperenv.rb b/Library/ENV/libsuperenv.rb index 49c2d7d2eb..5757834604 100644 --- a/Library/ENV/libsuperenv.rb +++ b/Library/ENV/libsuperenv.rb @@ -25,5 +25,5 @@ class Array end end -$brewfix = "#{__FILE__}/../../../".cleanpath.freeze +$brewfix = ENV['HOMEBREW_PREFIX'].freeze $sdkroot = ENV['HOMEBREW_SDKROOT'].freeze diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 9fc3c17b5b..080745e988 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -72,6 +72,7 @@ module Superenv self['HOMEBREW_CCCFG'] = determine_cccfg self['HOMEBREW_OPTIMIZATION_LEVEL'] = 'Os' self['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE + self['HOMEBREW_PREFIX'] = HOMEBREW_PREFIX 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_VERBOSE'] = "1" if ARGV.verbose?