parent
230161c1de
commit
858da0063d
@ -127,10 +127,15 @@ class Cmd
|
|||||||
loop do
|
loop do
|
||||||
case arg = enum.next
|
case arg = enum.next
|
||||||
when "-arch"
|
when "-arch"
|
||||||
|
if cccfg?("K")
|
||||||
|
args << arg << enum.next
|
||||||
|
else
|
||||||
enum.next
|
enum.next
|
||||||
|
end
|
||||||
when "-m32"
|
when "-m32"
|
||||||
args << arg if cccfg?("3")
|
args << arg if cccfg?("3") || cccfg?("K")
|
||||||
when "-m64"
|
when "-m64"
|
||||||
|
args << arg if cccfg?("K")
|
||||||
when /^-Xarch_/
|
when /^-Xarch_/
|
||||||
refurbished = refurbish_arg(enum.next, enum)
|
refurbished = refurbish_arg(enum.next, enum)
|
||||||
unless refurbished.empty?
|
unless refurbished.empty?
|
||||||
|
|||||||
@ -239,4 +239,6 @@ module SharedEnvExtension
|
|||||||
EOS
|
EOS
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def permit_arch_flags; end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -81,6 +81,7 @@ module Superenv
|
|||||||
# x - Enable C++11 mode.
|
# x - Enable C++11 mode.
|
||||||
# g - Enable "-stdlib=libc++" for clang.
|
# g - Enable "-stdlib=libc++" for clang.
|
||||||
# h - Enable "-stdlib=libstdc++" for clang.
|
# h - Enable "-stdlib=libstdc++" for clang.
|
||||||
|
# K - Don't strip -arch <arch>, -m32, or -m64
|
||||||
#
|
#
|
||||||
# On 10.8 and newer, these flags will also be present:
|
# On 10.8 and newer, these flags will also be present:
|
||||||
# s - apply fix for sed's Unicode support
|
# s - apply fix for sed's Unicode support
|
||||||
@ -266,6 +267,10 @@ module Superenv
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def permit_arch_flags
|
||||||
|
append "HOMEBREW_CCCFG", "K"
|
||||||
|
end
|
||||||
|
|
||||||
def cxx11
|
def cxx11
|
||||||
case self["HOMEBREW_CC"]
|
case self["HOMEBREW_CC"]
|
||||||
when "clang"
|
when "clang"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user