From b86ead91ea51b5e858d3e333e642728759d3da3b Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 10 Mar 2012 19:21:14 +1300 Subject: [PATCH] Revert "Always build bottles universally." This reverts commit 72a477f2734939d4c5805247588c4cdea69b5383. --- Library/Homebrew/extend/ARGV.rb | 2 +- Library/Homebrew/extend/ENV.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 4557825c92..25d19e2e7f 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -85,7 +85,7 @@ module HomebrewArgvExtension end def build_universal? - include? '--universal' or build_bottle? + include? '--universal' end # Request a 32-bit only build. diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index c239966de7..4db3cd5041 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -377,9 +377,7 @@ Please take one of the following actions: append flags, xarch unless xarch.empty? if ARGV.build_bottle? - ohai "Building a universal bottle." append flags, '-mtune=' + map.fetch(:bottle) if map.has_key? :bottle - universal_binary else # Don't set -msse3 and older flags because -march does that for us append flags, '-march=' + map.fetch(Hardware.intel_family, default)