From 3f357861aa2dde712b02f2e2a05e30aefc0c4842 Mon Sep 17 00:00:00 2001 From: Caleb Xu Date: Thu, 28 Oct 2021 15:25:44 -0400 Subject: [PATCH 1/2] formula: allow optional output path in std_go_args --- Library/Homebrew/formula.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 58f3d9af86..c7ed78a338 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1528,9 +1528,9 @@ class Formula end # Standard parameters for Go builds. - sig { params(ldflags: T.nilable(String)).returns(T::Array[String]) } - def std_go_args(ldflags: nil) - args = ["-trimpath", "-o=#{bin/name}"] + sig { params(output: T.any(String, Pathname), ldflags: T.nilable(String)).returns(T::Array[String]) } + def std_go_args(output: bin/name, ldflags: nil) + args = ["-trimpath", "-o=#{output}"] args += ["-ldflags=#{ldflags}"] if ldflags args end From 97bc320836deb1195a1bf8f646a26c8c72ff845e Mon Sep 17 00:00:00 2001 From: Caleb Xu Date: Mon, 15 Nov 2021 14:33:46 -0500 Subject: [PATCH 2/2] std_go_args: accept ldflags as string or Array(string) --- Library/Homebrew/formula.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index c7ed78a338..8af5410613 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1528,10 +1528,13 @@ class Formula end # Standard parameters for Go builds. - sig { params(output: T.any(String, Pathname), ldflags: T.nilable(String)).returns(T::Array[String]) } + sig { + params(output: T.any(String, Pathname), + ldflags: T.nilable(T.any(String, T::Array[String]))).returns(T::Array[String]) + } def std_go_args(output: bin/name, ldflags: nil) args = ["-trimpath", "-o=#{output}"] - args += ["-ldflags=#{ldflags}"] if ldflags + args += ["-ldflags=#{Array(ldflags).join(" ")}"] if ldflags args end