add libdir argument to fix conflicts with other versions of gcc libs - …

…fix #41
osx-cross · Nov 7, 2017 · 50b95f3 · 50b95f3
1 parent 848863e
commit 50b95f3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/avr-gcc.rb b/avr-gcc.rb
@@ -28,6 +28,14 @@ class AvrGcc < Formula
     sha256 "b2dd7fd2eefd8d8646ef6a325f6f0665537e2f604ed02828ced748d49dc85b97"
   end
 
+  def version_suffix
+    if build.head?
+      (stable.version.to_s.slice(/\d/).to_i + 1).to_s
+    else
+      version.to_s.slice(/\d/)
+    end
+  end
+
   cxxstdlib_check :skip
 
   def install
@@ -38,6 +46,7 @@ def install
     args = [
       "--target=avr",
       "--prefix=#{prefix}",
+      "--libdir=#{lib}/gcc/#{version_suffix}",
 
       "--enable-languages=#{languages.join(",")}",
       "--with-ld=#{Formula["avr-binutils"].opt_bin/"avr-ld"}",

diff --git a/avr-gcc@4.rb b/avr-gcc@4.rb
@@ -28,6 +28,14 @@ class AvrGccAT4 < Formula
     sha256 "b2dd7fd2eefd8d8646ef6a325f6f0665537e2f604ed02828ced748d49dc85b97"
   end
 
+def version_suffix
+    if build.head?
+      (stable.version.to_s.slice(/\d/).to_i + 1).to_s
+    else
+      version.to_s.slice(/\d/)
+    end
+  end
+
   cxxstdlib_check :skip
 
   def install
@@ -41,6 +49,7 @@ def install
     args = [
       "--target=avr",
       "--prefix=#{prefix}",
+      "--libdir=#{lib}/gcc/#{version_suffix}",
 
       "--enable-languages=#{languages.join(",")}",
       "--with-ld=#{Formula["avr-binutils"].opt_bin/"avr-ld"}",

diff --git a/avr-gcc@5.rb b/avr-gcc@5.rb
@@ -28,6 +28,14 @@ class AvrGccAT5 < Formula
     sha256 "b2dd7fd2eefd8d8646ef6a325f6f0665537e2f604ed02828ced748d49dc85b97"
   end
 
+def version_suffix
+    if build.head?
+      (stable.version.to_s.slice(/\d/).to_i + 1).to_s
+    else
+      version.to_s.slice(/\d/)
+    end
+  end
+
   cxxstdlib_check :skip
 
   def install
@@ -41,6 +49,7 @@ def install
     args = [
       "--target=avr",
       "--prefix=#{prefix}",
+      "--libdir=#{lib}/gcc/#{version_suffix}",
 
       "--enable-languages=#{languages.join(",")}",
       "--with-ld=#{Formula["avr-binutils"].opt_bin/"avr-ld"}",

diff --git a/avr-gcc@6.rb b/avr-gcc@6.rb
@@ -28,6 +28,14 @@ class AvrGccAT6 < Formula
     sha256 "b2dd7fd2eefd8d8646ef6a325f6f0665537e2f604ed02828ced748d49dc85b97"
   end
 
+def version_suffix
+    if build.head?
+      (stable.version.to_s.slice(/\d/).to_i + 1).to_s
+    else
+      version.to_s.slice(/\d/)
+    end
+  end
+
   cxxstdlib_check :skip
 
   def install
@@ -41,6 +49,7 @@ def install
     args = [
       "--target=avr",
       "--prefix=#{prefix}",
+      "--libdir=#{lib}/gcc/#{version_suffix}",
 
       "--enable-languages=#{languages.join(",")}",
       "--with-ld=#{Formula["avr-binutils"].opt_bin/"avr-ld"}",