From 4e9ed68ee7ef2c80dcfd038c54e937646cc0ece2 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 20 Jul 2023 11:21:13 -0700 Subject: cmd/go: don't collect package CGOLDFLAGS when using gccgo They are already collected via cmd/cgo. The gccgo_link_c test is tweaked to do real linking as with this change the cgo ldflags are not fully reflected in go build -n output, since they now only come from the built archive. This is a backport of https://go.dev/cl/497117 from the main repo. For golang/go#60287 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/511675 --- gcc/go/gofrontend/MERGE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc/go') diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index c44cdc2..83ab3e2 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -92152c88ea8e2dd9e8c67e91bf4ae5e3edf1b506 +d04b024021bb7dbaa434a6d902bd12beb08e315f The first line of this file holds the git revision number of the last merge done from the gofrontend repository. -- cgit v1.1