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

ENV: warn_if_universal_binaries_not_supported

Browse Source 
Raise an error when attempting to create universal binaries with a GCC
that can't do so.

Closes Homebrew/homebrew#46630.

Signed-off-by: Baptiste Fontaine <batifon@yahoo.fr>
This commit is contained in:
Ryan Hendrickson 2015-12-09 10:37:49 -05:00 committed by Baptiste Fontaine
parent d5de719c2b
commit 8ce81af67a
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/extend/ENV/shared.rb
View File

@ -306,4 +306,10 @@ module SharedEnvExtension
end end
end end
end end
def check_for_compiler_universal_support
if homebrew_cc =~ GNU_GCC_REGEXP
raise "Non-Apple GCC can't build universal binaries"
end
end
end end

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

@ -269,6 +269,8 @@ module Stdenv
end end
def universal_binary def universal_binary
check_for_compiler_universal_support
append_to_cflags Hardware::CPU.universal_archs.as_arch_flags append_to_cflags Hardware::CPU.universal_archs.as_arch_flags
append "LDFLAGS", Hardware::CPU.universal_archs.as_arch_flags append "LDFLAGS", Hardware::CPU.universal_archs.as_arch_flags

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

@ -268,6 +268,8 @@ module Superenv
end end
def universal_binary def universal_binary
check_for_compiler_universal_support
self["HOMEBREW_ARCHFLAGS"] = Hardware::CPU.universal_archs.as_arch_flags self["HOMEBREW_ARCHFLAGS"] = Hardware::CPU.universal_archs.as_arch_flags
# GCC doesn't accept "-march" for a 32-bit CPU with "-arch x86_64" # GCC doesn't accept "-march" for a 32-bit CPU with "-arch x86_64"