Merge pull request #7468 from runlevel5/support-gcc-10

Support GCC 10
Homebrew · May 1, 2020 · a2d4114 · a2d4114
2 parents 3e20393 + 3de9fc9
commit a2d4114
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 5 deletions.
diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb
@@ -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,

diff --git a/Library/Homebrew/development_tools.rb b/Library/Homebrew/development_tools.rb
@@ -78,7 +78,7 @@ def non_apple_gcc_version(cc)
         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

diff --git a/Library/Homebrew/extend/os/linux/install.rb b/Library/Homebrew/extend/os/linux/install.rb
@@ -6,6 +6,7 @@ module Install
 
     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",

diff --git a/Library/Homebrew/shims/linux/super/g++-10 b/Library/Homebrew/shims/linux/super/g++-10
@@ -0,0 +1 @@
+cc
diff --git a/Library/Homebrew/shims/linux/super/gcc-10 b/Library/Homebrew/shims/linux/super/gcc-10
@@ -0,0 +1 @@
+cc
diff --git a/Library/Homebrew/shims/mac/super/g++-10 b/Library/Homebrew/shims/mac/super/g++-10
@@ -0,0 +1 @@
+cc
diff --git a/Library/Homebrew/shims/mac/super/gcc-10 b/Library/Homebrew/shims/mac/super/gcc-10
@@ -0,0 +1 @@
+cc
diff --git a/Library/Homebrew/shims/super/cc b/Library/Homebrew/shims/super/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

diff --git a/Library/Homebrew/shims/super/g++-10 b/Library/Homebrew/shims/super/g++-10
@@ -0,0 +1 @@
+cc
diff --git a/Library/Homebrew/shims/super/gcc-10 b/Library/Homebrew/shims/super/gcc-10
@@ -0,0 +1 @@
+cc