Add option for building bottles.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
parent
555e7ff893
commit
a3db9a42e8
@ -81,12 +81,13 @@ module HomebrewArgvExtension
|
|||||||
include? '--32-bit'
|
include? '--32-bit'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def build_bottle?
|
||||||
|
MacOS.bottles_supported? and include? '--build-bottle'
|
||||||
|
end
|
||||||
|
|
||||||
def build_from_source?
|
def build_from_source?
|
||||||
return true if flag? '--build-from-source' or ENV['HOMEBREW_BUILD_FROM_SOURCE'] \
|
flag? '--build-from-source' or ENV['HOMEBREW_BUILD_FROM_SOURCE'] \
|
||||||
or not MacOS.lion? or HOMEBREW_PREFIX.to_s != '/usr/local'
|
or not MacOS.bottles_supported? or not options_only.empty?
|
||||||
options = options_only
|
|
||||||
options.delete '--universal'
|
|
||||||
not options.empty?
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def flag? flag
|
def flag? flag
|
||||||
|
|||||||
@ -398,6 +398,10 @@ module MacOS extend self
|
|||||||
def prefer_64_bit?
|
def prefer_64_bit?
|
||||||
Hardware.is_64_bit? and 10.6 <= MACOS_VERSION
|
Hardware.is_64_bit? and 10.6 <= MACOS_VERSION
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def bottles_supported?
|
||||||
|
lion? and HOMEBREW_PREFIX.to_s == '/usr/local'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
module GitHub extend self
|
module GitHub extend self
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user