Merge pull request #178774 from Homebrew/i686-elf-gcc-linkage

i686-elf-gcc, i386-elf-gdb: declare indirect deps with linkage
Homebrew · Jul 28, 2024 · 5b19e68 · 5b19e68
2 parents ef9b2fc + 68d29ec
commit 5b19e68
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Formula/i/i386-elf-gdb.rb b/Formula/i/i386-elf-gdb.rb
@@ -27,6 +27,8 @@ class I386ElfGdb < Formula
   depends_on "[email protected]"
   depends_on "xz" # required for lzma support
 
+  uses_from_macos "expat"
+  uses_from_macos "ncurses"
   uses_from_macos "zlib"
 
   on_system :linux, macos: :ventura_or_newer do
@@ -60,7 +62,8 @@ def install
   test do
     (testpath/"test.c").write "void _start(void) {}"
     system Formula["i686-elf-gcc"].bin/"i686-elf-gcc", "-g", "-nostdlib", "test.c"
-    assert_match "Symbol \"_start\" is a function at address 0x",
-                 shell_output("#{bin}/i386-elf-gdb -batch -ex 'info address _start' a.out")
+
+    output = shell_output("#{bin}/i386-elf-gdb -batch -ex 'info address _start' a.out")
+    assert_match "Symbol \"_start\" is a function at address 0x", output
   end
 end
diff --git a/Formula/i/i686-elf-gcc.rb b/Formula/i/i686-elf-gcc.rb
@@ -24,6 +24,7 @@ class I686ElfGcc < Formula
   depends_on "i686-elf-binutils"
   depends_on "libmpc"
   depends_on "mpfr"
+  depends_on "zstd"
 
   def install
     target = "i686-elf"
@@ -56,8 +57,9 @@ def install
         return i;
       }
     EOS
-    system "#{bin}/i686-elf-gcc", "-c", "-o", "test-c.o", "test-c.c"
-    assert_match "file format elf32-i386",
-      shell_output("#{Formula["i686-elf-binutils"].bin}/i686-elf-objdump -a test-c.o")
+
+    system bin/"i686-elf-gcc", "-c", "-o", "test-c.o", "test-c.c"
+    output = shell_output("#{Formula["i686-elf-binutils"].bin}/i686-elf-objdump -a test-c.o")
+    assert_match "file format elf32-i386", output
   end
 end