Use new Xcode module
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
parent
11cfca0e12
commit
4eeb0e6441
@ -677,7 +677,7 @@ def check_git_newline_settings
|
|||||||
end
|
end
|
||||||
|
|
||||||
def check_for_autoconf
|
def check_for_autoconf
|
||||||
return if MacOS::Xcode.version >= "4.3"
|
return unless MacOS::Xcode.provides_autotools?
|
||||||
|
|
||||||
autoconf = which('autoconf')
|
autoconf = which('autoconf')
|
||||||
safe_autoconfs = %w[/usr/bin/autoconf /Developer/usr/bin/autoconf]
|
safe_autoconfs = %w[/usr/bin/autoconf /Developer/usr/bin/autoconf]
|
||||||
|
|||||||
@ -61,7 +61,7 @@ private
|
|||||||
case spec
|
case spec
|
||||||
when :autoconf, :automake, :bsdmake, :libtool
|
when :autoconf, :automake, :bsdmake, :libtool
|
||||||
# Xcode no longer provides autotools or some other build tools
|
# Xcode no longer provides autotools or some other build tools
|
||||||
MacOS.xcode_version >= "4.3" ? Dependency.new(spec.to_s) : nil
|
Dependency.new(spec.to_s) unless MacOS::Xcode.provides_autotools?
|
||||||
when :x11, :libpng
|
when :x11, :libpng
|
||||||
X11Dependency.new(tag)
|
X11Dependency.new(tag)
|
||||||
else
|
else
|
||||||
|
|||||||
@ -10,7 +10,7 @@ module HomebrewEnvExtension
|
|||||||
remove_cc_etc
|
remove_cc_etc
|
||||||
|
|
||||||
# make any aclocal stuff installed in Homebrew available
|
# make any aclocal stuff installed in Homebrew available
|
||||||
self['ACLOCAL_PATH'] = "#{HOMEBREW_PREFIX}/share/aclocal" if MacOS::Xcode.version < "4.3"
|
self['ACLOCAL_PATH'] = "#{HOMEBREW_PREFIX}/share/aclocal" if MacOS::Xcode.provides_autotools?
|
||||||
|
|
||||||
self['MAKEFLAGS'] = "-j#{self.make_jobs}"
|
self['MAKEFLAGS'] = "-j#{self.make_jobs}"
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user