From 1f1d24389050b8d2fa86a00d0658821dd3dfbb26 Mon Sep 17 00:00:00 2001 From: Scott Beamer Date: Wed, 6 Dec 2023 17:08:37 -0800 Subject: [PATCH] update riscv-gnu-toolchain - gdb is problematic to build on macOS so disabling for now - gdb can be built with a new bison carefully using key-only - taking a more conservative approach to /share/ polution --- riscv-gnu-toolchain.rb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/riscv-gnu-toolchain.rb b/riscv-gnu-toolchain.rb index d3a45a7..2fe4b7a 100644 --- a/riscv-gnu-toolchain.rb +++ b/riscv-gnu-toolchain.rb @@ -59,6 +59,7 @@ def install args = [ "--prefix=#{prefix}", "--with-cmodel=medany", + "--disable-gdb" ] args << "--enable-multilib" unless build.with?("NOmultilib") @@ -70,19 +71,16 @@ def install system "./configure", *args system "make" - # don't install Python bindings if system already has them - if File.exist?("#{HOMEBREW_PREFIX}/share/gcc-11.1.0") - opoo "Not overwriting share/gcc-11.1.0" - rm_rf "#{share}/gcc-11.1.0" - end - # don't install gdb bindings if system already has them if File.exist?("#{HOMEBREW_PREFIX}/share/gdb") opoo "Not overwriting share/gdb" rm_rf "#{share}/gdb" - rm "#{share}/info/annotate.info" - rm "#{share}/info/gdb.info" - rm "#{share}/info/stabs.info" + end + + # don't install info if system already has them + if File.exist?("#{HOMEBREW_PREFIX}/share/info") + opoo "Not overwriting share/info" + rm_rf "#{share}/info" end # don't install gdb includes if system already has them