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

No need to cache lookup that is only done once

Browse Source
This commit is contained in:
Jack Nagel 2014-07-13 10:50:56 -05:00
parent 2bbc98694a
commit fe0c018a1a
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/extend/ENV/shared.rb
View File

@ -196,15 +196,12 @@ module SharedEnvExtension
gcc_name = "gcc-#{version}" gcc_name = "gcc-#{version}"
gcc_version_name = "gcc#{version.delete('.')}" gcc_version_name = "gcc#{version.delete('.')}"
ivar = "@#{gcc_version_name}_version"
return instance_variable_get(ivar) if instance_variable_defined?(ivar)
gcc_path = HOMEBREW_PREFIX.join "opt/gcc/bin/#{gcc_name}" gcc_path = HOMEBREW_PREFIX.join "opt/gcc/bin/#{gcc_name}"
gcc_formula = Formulary.factory "gcc" gcc_formula = Formulary.factory "gcc"
gcc_versions_path = \ gcc_versions_path = \
HOMEBREW_PREFIX.join "opt/#{gcc_version_name}/bin/#{gcc_name}" HOMEBREW_PREFIX.join "opt/#{gcc_version_name}/bin/#{gcc_name}"
formula = if gcc_path.exist? if gcc_path.exist?
gcc_formula gcc_formula
elsif gcc_versions_path.exist? elsif gcc_versions_path.exist?
Formulary.factory gcc_version_name Formulary.factory gcc_version_name
@ -215,8 +212,6 @@ module SharedEnvExtension
else else
gcc_formula gcc_formula
end end
instance_variable_set(ivar, formula)
end end
def warn_about_non_apple_gcc(gcc) def warn_about_non_apple_gcc(gcc)