mirror of
https://github.com/Homebrew/brew.git
synced 2025-07-14 16:09:03 +08:00
commit
a2d4114089
@ -2,8 +2,8 @@
|
||||
|
||||
# @private
|
||||
module CompilerConstants
|
||||
GNU_GCC_VERSIONS = %w[4.9 5 6 7 8 9].freeze
|
||||
GNU_GCC_REGEXP = /^gcc-(4\.9|[5-9])$/.freeze
|
||||
GNU_GCC_VERSIONS = %w[4.9 5 6 7 8 9 10].freeze
|
||||
GNU_GCC_REGEXP = /^gcc-(4\.9|[5-9]|10)$/.freeze
|
||||
COMPILER_SYMBOL_MAP = {
|
||||
"gcc" => :gcc,
|
||||
"clang" => :clang,
|
||||
|
@ -78,7 +78,7 @@ class DevelopmentTools
|
||||
path = HOMEBREW_PREFIX/"opt/gcc/bin"/cc
|
||||
path = locate(cc) unless path.exist?
|
||||
version = if path &&
|
||||
build_version = `#{path} --version`[/gcc(?:(?:-\d(?:\.\d)?)? \(.+\))? (\d\.\d\.\d)/, 1]
|
||||
build_version = `#{path} --version`[/gcc(?:(?:-\d(?:\.\d)?)? \(.+\))? (\d+\.\d\.\d)/, 1]
|
||||
Version.new build_version
|
||||
else
|
||||
Version::NULL
|
||||
|
@ -6,6 +6,7 @@ module Homebrew
|
||||
|
||||
DYNAMIC_LINKERS = [
|
||||
"/lib64/ld-linux-x86-64.so.2",
|
||||
"/lib64/ld64.so.2",
|
||||
"/lib/ld-linux.so.3",
|
||||
"/lib/ld-linux.so.2",
|
||||
"/lib/ld-linux-aarch64.so.1",
|
||||
|
1
Library/Homebrew/shims/linux/super/g++-10
Symbolic link
1
Library/Homebrew/shims/linux/super/g++-10
Symbolic link
@ -0,0 +1 @@
|
||||
cc
|
1
Library/Homebrew/shims/linux/super/gcc-10
Symbolic link
1
Library/Homebrew/shims/linux/super/gcc-10
Symbolic link
@ -0,0 +1 @@
|
||||
cc
|
1
Library/Homebrew/shims/mac/super/g++-10
Symbolic link
1
Library/Homebrew/shims/mac/super/g++-10
Symbolic link
@ -0,0 +1 @@
|
||||
cc
|
1
Library/Homebrew/shims/mac/super/gcc-10
Symbolic link
1
Library/Homebrew/shims/mac/super/gcc-10
Symbolic link
@ -0,0 +1 @@
|
||||
cc
|
@ -76,13 +76,13 @@ class Cmd
|
||||
when "cpp" then "cpp"
|
||||
when /llvm_(clang(\+\+)?)/
|
||||
"#{ENV["HOMEBREW_PREFIX"]}/opt/llvm/bin/#{$1}"
|
||||
when /\w\+\+(-\d(\.\d)?)?$/
|
||||
when /\w\+\+(-\d+(\.\d)?)?$/
|
||||
case ENV["HOMEBREW_CC"]
|
||||
when /clang/
|
||||
"clang++"
|
||||
when /llvm-gcc/
|
||||
"llvm-g++-4.2"
|
||||
when /(g)?cc(-\d(\.\d)?)?$/
|
||||
when /(g)?cc(-\d+(\.\d)?)?$/
|
||||
"g++" + $2.to_s
|
||||
end
|
||||
else
|
||||
|
1
Library/Homebrew/shims/super/g++-10
Symbolic link
1
Library/Homebrew/shims/super/g++-10
Symbolic link
@ -0,0 +1 @@
|
||||
cc
|
1
Library/Homebrew/shims/super/gcc-10
Symbolic link
1
Library/Homebrew/shims/super/gcc-10
Symbolic link
@ -0,0 +1 @@
|
||||
cc
|
Loading…
x
Reference in New Issue
Block a user