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

Revert "RbConfig: fix broken MacOS SDK paths"

Browse Source 
This reverts commit 11445e0f3edf29ee64081c5a05b5257d9b5ccdd9.
This commit is contained in:
Mike McQuaid 2020-12-08 17:14:00 +00:00
parent b2aad180fd
commit 9b4a7856ac
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/extend/rbconfig_extension.rb
View File

@ -1,17 +0,0 @@
# typed: false
# frozen_string_literal: true
macos_version = ENV["HOMEBREW_MACOS_VERSION"][0..4]
macos_sdk = "MacOSX#{macos_version}.sdk"
# Ruby hardcodes what might end up being an incorrect SDK path in some of the
# variables that get used in mkmf.rb.
# This patches them up to use the correct SDK.
RbConfig::CONFIG.each do |k, v|
next unless v.include?("MacOSX.sdk")
new_value = v.gsub("MacOSX.sdk", macos_sdk)
next unless File.exist?(new_value)
RbConfig::CONFIG[k] = new_value
end

11
Library/Homebrew/utils/gems.rb
View File

@ -109,15 +109,6 @@ module Homebrew
install_bundler!
ENV["BUNDLE_GEMFILE"] = File.join(ENV.fetch("HOMEBREW_LIBRARY"), "Homebrew", "Gemfile")
# We can't use OS.mac? because not enough has
# been required yet this early in the boot process
if ENV["HOMEBREW_SYSTEM"] == "Macintosh"
# This patches up some paths used by mkmf.rb
extend_path = File.join(ENV.fetch("HOMEBREW_LIBRARY"), "Homebrew", "extend")
ENV["RUBYOPT"] = "-r#{extend_path}/rbconfig_extension"
end
@bundle_installed ||= begin
bundle = File.join(find_in_path("bundle"), "bundle")
bundle_check_output = `#{bundle} check 2>&1`
@ -135,8 +126,6 @@ module Homebrew
end
end
ENV["RUBYOPT"] = ""
setup_gem_environment!
end
end