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

Merge pull request #11608 from carlocab/runtime-arch

Browse Source 
superenv: handle formulae with runtime CPU detection
This commit is contained in:
Carlo Cabrera 2021-07-01 10:16:42 -07:00 committed by GitHub
commit 89aeaffd9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,10 +91,11 @@ module Superenv
# 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 # K - Don't strip -arch <arch>, -m32, or -m64
# d - Don't strip -march=<target>. Use only in formulae that
# have runtime detection of CPU features.
# w - Pass -no_weak_imports to the linker # w - Pass -no_weak_imports to the linker
# #
# These flags will also be present: # These flags will also be present:
# s - apply fix for sed's Unicode support
# a - apply fix for apr-1-config path # a - apply fix for apr-1-config path
end end
alias generic_setup_build_environment setup_build_environment alias generic_setup_build_environment setup_build_environment
@ -314,6 +315,11 @@ module Superenv
append_to_cccfg "K" append_to_cccfg "K"
end end
sig { void }
def runtime_cpu_detection
append_to_cccfg "d"
end
sig { void } sig { void }
def cxx11 def cxx11
append_to_cccfg "x" append_to_cccfg "x"

14
Library/Homebrew/shims/super/cc
View File

@ -173,10 +173,12 @@ class Cmd
case arg case arg
when /^-g\d?$/, /^-gstabs\d+/, "-gstabs+", /^-ggdb\d?/, when /^-g\d?$/, /^-gstabs\d+/, "-gstabs+", /^-ggdb\d?/,
/^-march=.+/, /^-mtune=.+/, /^-mcpu=.+/, /^-mtune=.+/, /^-mcpu=.+/, /^-O[0-9zs]?$/,
/^-O[0-9zs]?$/, "-fast", "-no-cpp-precomp", "-fast", "-no-cpp-precomp", "-pedantic",
"-pedantic", "-pedantic-errors", "-Wno-long-double", "-pedantic-errors", "-Wno-long-double",
"-Wno-unused-but-set-variable" "-Wno-unused-but-set-variable"
when /^-march=.+/
args << arg if runtime_cpu_detection?
when "-fopenmp", "-lgomp", "-mno-fused-madd", "-fforce-addr", "-fno-defer-pop", when "-fopenmp", "-lgomp", "-mno-fused-madd", "-fforce-addr", "-fno-defer-pop",
"-mno-dynamic-no-pic", "-fearly-inlining", /^-f(?:no-)?inline-functions-called-once/, "-mno-dynamic-no-pic", "-fearly-inlining", /^-f(?:no-)?inline-functions-called-once/,
/^-finline-limit/, /^-f(?:no-)?check-new/, "-fno-delete-null-pointer-checks", /^-finline-limit/, /^-f(?:no-)?check-new/, "-fno-delete-null-pointer-checks",
@ -283,7 +285,7 @@ class Cmd
args << "-pipe" args << "-pipe"
args << "-w" unless configure? args << "-w" unless configure?
args << "-#{ENV["HOMEBREW_OPTIMIZATION_LEVEL"]}" args << "-#{ENV["HOMEBREW_OPTIMIZATION_LEVEL"]}"
args.concat(optflags) args.concat(optflags) unless runtime_cpu_detection?
args.concat(archflags) args.concat(archflags)
args << "-std=#{@arg0}" if /c[89]9/.match?(@arg0) args << "-std=#{@arg0}" if /c[89]9/.match?(@arg0)
args args
@ -385,6 +387,10 @@ class Cmd
config.include?("K") config.include?("K")
end end
def runtime_cpu_detection?
config.include?("d")
end
def no_weak_imports? def no_weak_imports?
config.include?("w") config.include?("w")
end end