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

Revert "Always build bottles universally."

Browse Source 
This reverts commit 72a477f2734939d4c5805247588c4cdea69b5383.
This commit is contained in:
Mike McQuaid 2012-03-10 19:21:14 +13:00
parent 6d940a5bcc
commit b86ead91ea
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/extend/ARGV.rb
View File

@ -85,7 +85,7 @@ module HomebrewArgvExtension
end end
def build_universal? def build_universal?
include? '--universal' or build_bottle? include? '--universal'
end end
# Request a 32-bit only build. # Request a 32-bit only build.

2
Library/Homebrew/extend/ENV.rb
View File

@ -377,9 +377,7 @@ Please take one of the following actions:
append flags, xarch unless xarch.empty? append flags, xarch unless xarch.empty?
if ARGV.build_bottle? if ARGV.build_bottle?
ohai "Building a universal bottle."
append flags, '-mtune=' + map.fetch(:bottle) if map.has_key? :bottle append flags, '-mtune=' + map.fetch(:bottle) if map.has_key? :bottle
universal_binary
else else
# Don't set -msse3 and older flags because -march does that for us # Don't set -msse3 and older flags because -march does that for us
append flags, '-march=' + map.fetch(Hardware.intel_family, default) append flags, '-march=' + map.fetch(Hardware.intel_family, default)