Merge pull request #550 from mistydemeo/backport_g3_gcc_fix

Backport G3 GCC fix to older GCCs
mistydemeo · Jan 12, 2018 · 2957b57 · 2957b57
2 parents 67e64de + 38e441f
commit 2957b57
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 0 deletions.
diff --git a/Library/Formula/gcc44.rb b/Library/Formula/gcc44.rb
@@ -68,6 +68,10 @@ def install
     # GCC will suffer build errors if forced to use a particular linker.
     ENV.delete "LD"
 
+    # Otherwise libstdc++ will be incorrectly tagged with cpusubtype 10 (G4e)
+    # https://github.com/mistydemeo/tigerbrew/issues/538
+    ENV.append_to_cflags "-force_cpusubtype_ALL" if Hardware::CPU.family == :g3
+
     if build.with? "all-languages"
       # Everything but Ada, which requires a pre-existing GCC Ada compiler
       # (gnat) to bootstrap.

diff --git a/Library/Formula/gcc45.rb b/Library/Formula/gcc45.rb
@@ -85,6 +85,10 @@ def install
     # GCC will suffer build errors if forced to use a particular linker.
     ENV.delete "LD"
 
+    # Otherwise libstdc++ will be incorrectly tagged with cpusubtype 10 (G4e)
+    # https://github.com/mistydemeo/tigerbrew/issues/538
+    ENV.append_to_cflags "-force_cpusubtype_ALL" if Hardware::CPU.family == :g3
+
     if build.with? "all-languages"
       # Everything but Ada, which requires a pre-existing GCC Ada compiler
       # (gnat) to bootstrap.

diff --git a/Library/Formula/gcc46.rb b/Library/Formula/gcc46.rb
@@ -81,6 +81,10 @@ def install
     # GCC will suffer build errors if forced to use a particular linker.
     ENV.delete "LD"
 
+    # Otherwise libstdc++ will be incorrectly tagged with cpusubtype 10 (G4e)
+    # https://github.com/mistydemeo/tigerbrew/issues/538
+    ENV.append_to_cflags "-force_cpusubtype_ALL" if Hardware::CPU.family == :g3
+
     if build.with? "all-languages"
       # Everything but Ada, which requires a pre-existing GCC Ada compiler
       # (gnat) to bootstrap. GCC 4.6.0 add go as a language option, but it is

diff --git a/Library/Formula/gcc47.rb b/Library/Formula/gcc47.rb
@@ -83,6 +83,10 @@ def install
     # GCC will suffer build errors if forced to use a particular linker.
     ENV.delete "LD"
 
+    # Otherwise libstdc++ will be incorrectly tagged with cpusubtype 10 (G4e)
+    # https://github.com/mistydemeo/tigerbrew/issues/538
+    ENV.append_to_cflags "-force_cpusubtype_ALL" if Hardware::CPU.family == :g3
+
     if build.with? "all-languages"
       # Everything but Ada, which requires a pre-existing GCC Ada compiler
       # (gnat) to bootstrap. GCC 4.6.0 add go as a language option, but it is

diff --git a/Library/Formula/gcc48.rb b/Library/Formula/gcc48.rb
@@ -89,6 +89,10 @@ def install
     # GCC will suffer build errors if forced to use a particular linker.
     ENV.delete "LD"
 
+    # Otherwise libstdc++ will be incorrectly tagged with cpusubtype 10 (G4e)
+    # https://github.com/mistydemeo/tigerbrew/issues/538
+    ENV.append_to_cflags "-force_cpusubtype_ALL" if Hardware::CPU.family == :g3
+
     if MacOS.version < :leopard
       ENV["AS"] = ENV["AS_FOR_TARGET"] = "#{Formula["cctools"].bin}/as"
     end

diff --git a/Library/Formula/gcc49.rb b/Library/Formula/gcc49.rb
@@ -83,6 +83,10 @@ def install
     # GCC will suffer build errors if forced to use a particular linker.
     ENV.delete "LD"
 
+    # Otherwise libstdc++ will be incorrectly tagged with cpusubtype 10 (G4e)
+    # https://github.com/mistydemeo/tigerbrew/issues/538
+    ENV.append_to_cflags "-force_cpusubtype_ALL" if Hardware::CPU.family == :g3
+
     if build.with? "all-languages"
       # Everything but Ada, which requires a pre-existing GCC Ada compiler
       # (gnat) to bootstrap. GCC 4.6.0 add go as a language option, but it is

diff --git a/Library/Formula/gcc5.rb b/Library/Formula/gcc5.rb
@@ -71,6 +71,10 @@ def install
     # GCC will suffer build errors if forced to use a particular linker.
     ENV.delete "LD"
 
+    # Otherwise libstdc++ will be incorrectly tagged with cpusubtype 10 (G4e)
+    # https://github.com/mistydemeo/tigerbrew/issues/538
+    ENV.append_to_cflags "-force_cpusubtype_ALL" if Hardware::CPU.family == :g3
+
     if MacOS.version < :leopard
       ENV["AS"] = ENV["AS_FOR_TARGET"] = "#{Formula["cctools"].bin}/as"
     end

diff --git a/Library/Formula/gcc6.rb b/Library/Formula/gcc6.rb
@@ -71,6 +71,10 @@ def install
     # GCC will suffer build errors if forced to use a particular linker.
     ENV.delete "LD"
 
+    # Otherwise libstdc++ will be incorrectly tagged with cpusubtype 10 (G4e)
+    # https://github.com/mistydemeo/tigerbrew/issues/538
+    ENV.append_to_cflags "-force_cpusubtype_ALL" if Hardware::CPU.family == :g3
+
     if MacOS.version < :leopard
       ENV["AS"] = ENV["AS_FOR_TARGET"] = "#{Formula["cctools"].bin}/as"
     end