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

Support HOMEBREW_MAKE_JOBS

Browse Source
This commit is contained in:
Max Howell 2012-08-23 16:15:26 -04:00
parent 36de29f65e
commit 1ec368759e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/superenv.rb
View File

@ -29,9 +29,7 @@ class << ENV
%w{CC CXX LD CPP OBJC MAKE %w{CC CXX LD CPP OBJC MAKE
CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS LDFLAGS CPPFLAGS CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS LDFLAGS CPPFLAGS
MACOS_DEPLOYMENT_TARGET SDKROOT MACOS_DEPLOYMENT_TARGET SDKROOT
CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_FRAMEWORK_PATH CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_FRAMEWORK_PATH}.
HOMEBREW_CCCFG HOMEBREW_DEP_PREFIXES
MAKEFLAGS MAKEJOBS}.
each{ |x| delete(x) } each{ |x| delete(x) }
delete('CDPATH') # avoid make issues that depend on changing directories delete('CDPATH') # avoid make issues that depend on changing directories
delete('GREP_OPTIONS') # can break CMake delete('GREP_OPTIONS') # can break CMake
@ -51,7 +49,7 @@ class << ENV
ENV['LD'] = 'ld' ENV['LD'] = 'ld'
ENV['CPP'] = 'cpp' ENV['CPP'] = 'cpp'
ENV['MAKE'] = 'make' ENV['MAKE'] = 'make'
ENV['MAKEFLAGS'] ||= "-j#{Hardware.processor_count}" ENV['MAKEFLAGS'] ||= "-j#{determine_make_jobs}"
ENV['PATH'] = determine_path ENV['PATH'] = determine_path
ENV['PKG_CONFIG_PATH'] = determine_pkg_config_path ENV['PKG_CONFIG_PATH'] = determine_pkg_config_path
ENV['HOMEBREW_CC'] = determine_cc ENV['HOMEBREW_CC'] = determine_cc
@ -149,6 +147,14 @@ class << ENV
paths.to_path_s paths.to_path_s
end end
def determine_make_jobs
if (j = ENV['HOMEBREW_MAKE_JOBS'].to_i) < 1
Hardware.processor_count
else
j
end
end
public public
### NO LONGER NECESSARY OR NO LONGER SUPPORTED ### NO LONGER NECESSARY OR NO LONGER SUPPORTED