aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2023-07-20 11:21:13 -0700
committerIan Lance Taylor <iant@golang.org>2023-07-20 12:29:11 -0700
commit4e9ed68ee7ef2c80dcfd038c54e937646cc0ece2 (patch)
tree13f70efcee22822bd2e62e4594f088a833421917 /gcc/go
parentb50a851eef4b70aabf28fa875d9b2a302d17b66a (diff)
downloadgcc-4e9ed68ee7ef2c80dcfd038c54e937646cc0ece2.zip
gcc-4e9ed68ee7ef2c80dcfd038c54e937646cc0ece2.tar.gz
gcc-4e9ed68ee7ef2c80dcfd038c54e937646cc0ece2.tar.bz2
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
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
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.