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

Move method to prepare for future changes

Browse Source
This commit is contained in:
Jack Nagel 2014-05-13 10:48:13 -05:00
parent ff25f7ecf7
commit 43d9640cb6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/extend/ENV/super.rb
View File

@ -158,6 +158,13 @@ module Superenv
paths.to_path_s paths.to_path_s
end end
def determine_aclocal_path
paths = keg_only_deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/share/aclocal" }
paths << "#{HOMEBREW_PREFIX}/share/aclocal"
paths << "#{MacOS::X11.share}/aclocal" if x11?
paths.to_path_s
end
def determine_cmake_prefix_path def determine_cmake_prefix_path
paths = keg_only_deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}" } paths = keg_only_deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}" }
paths << HOMEBREW_PREFIX.to_s # put ourselves ahead of everything else paths << HOMEBREW_PREFIX.to_s # put ourselves ahead of everything else
@ -195,13 +202,6 @@ module Superenv
paths.to_path_s paths.to_path_s
end end
def determine_aclocal_path
paths = keg_only_deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/share/aclocal" }
paths << "#{HOMEBREW_PREFIX}/share/aclocal"
paths << "#{MacOS::X11.share}/aclocal" if x11?
paths.to_path_s
end
def determine_make_jobs def determine_make_jobs
if (j = self['HOMEBREW_MAKE_JOBS'].to_i) < 1 if (j = self['HOMEBREW_MAKE_JOBS'].to_i) < 1
Hardware::CPU.cores Hardware::CPU.cores