From b62c77e8daec87796a2b9c618d0f142175c1e2a8 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Thu, 28 Dec 2023 15:55:22 -0500 Subject: [PATCH] formula_creator: keep `std_configure_args` Match `homebrew-core` preferences where we usually keep `std_configure_args` even if some args are unrecognized and where we pass any additional args before `std_configure_args`. --- Library/Homebrew/formula_creator.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/formula_creator.rb b/Library/Homebrew/formula_creator.rb index 12519fe756..274ee848ca 100644 --- a/Library/Homebrew/formula_creator.rb +++ b/Library/Homebrew/formula_creator.rb @@ -167,9 +167,9 @@ module Homebrew system "cmake", "--build", "build" system "cmake", "--install", "build" <% elsif @mode == :autotools %> - # Remove unrecognized options if warned by configure + # Remove unrecognized options if they cause configure to fail # https://rubydoc.brew.sh/Formula.html#std_configure_args-instance_method - system "./configure", *std_configure_args, "--disable-silent-rules" + system "./configure", "--disable-silent-rules", *std_configure_args system "make", "install" # if this fails, try separate make/make install steps <% elsif @mode == :crystal %> system "shards", "build", "--release" @@ -214,9 +214,9 @@ module Homebrew <% elsif @mode == :rust %> system "cargo", "install", *std_cargo_args <% else %> - # Remove unrecognized options if warned by configure + # Remove unrecognized options if they cause configure to fail # https://rubydoc.brew.sh/Formula.html#std_configure_args-instance_method - system "./configure", *std_configure_args, "--disable-silent-rules" + system "./configure", "--disable-silent-rules", *std_configure_args # system "cmake", "-S", ".", "-B", "build", *std_cmake_args <% end %> end