diff options
| author | cadrpear | 2014-01-08 00:08:52 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-02-19 14:15:03 -0500 |
| commit | 307348abc30705835db93cb5b572ddbc688abbd3 (patch) | |
| tree | 2a8dbe9e090b14281ee7c120638f1068968b6b35 /Library/Homebrew | |
| parent | ffe50a2a825df7f2241f3590b6f03a3e3a21e601 (diff) | |
| download | homebrew-307348abc30705835db93cb5b572ddbc688abbd3.tar.bz2 | |
Fix building universal binaries on 32-bit CPUs
[jn: style, update comment]
Closes #25728.
Fixes #26834.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index db2a1bf2d..cbfd3dd8c 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -262,6 +262,14 @@ module Superenv def universal_binary self['HOMEBREW_ARCHFLAGS'] = Hardware::CPU.universal_archs.as_arch_flags append 'HOMEBREW_CCCFG', "u", '' + + # GCC doesn't accept "-march" for a 32-bit CPU with "-arch x86_64" + if compiler != :clang && Hardware.is_32_bit? + self['HOMEBREW_OPTFLAGS'] = self['HOMEBREW_OPTFLAGS'].sub( + /-march=\S*/, + "-Xarch_#{Hardware::CPU.arch_32_bit} \\0" + ) + end end def cxx11 |