diff options
author | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-14 13:59:02 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-14 13:59:02 +0000 |
commit | ea9a08f5dfbab28de2eabfeb684b42c0615cd99d (patch) | |
tree | 6ce4306631e5e2799767b4aab2de1bd3f442eb58 /gcc/go | |
parent | 1279f21fc520cc8c91ef4dd3a8938b7aa256d799 (diff) | |
download | gcc-ea9a08f5dfbab28de2eabfeb684b42c0615cd99d.zip gcc-ea9a08f5dfbab28de2eabfeb684b42c0615cd99d.tar.gz gcc-ea9a08f5dfbab28de2eabfeb684b42c0615cd99d.tar.bz2 |
cmd/cgo: make _cgo_flags consistent across runs
The go tool will pass -I objdir as one of the flags, where objdir is
the temporary build directory. Remove that from _cgo_flags: we don't
need it, and it will be different each time.
Sort the flags to avoid the unpredictable map iteration order.
This matters for gccgo because for a package that uses cgo, the go
tool when building for gccgo will store the _cgo_flags file in the
archive. That means that we want to generate identical _cgo_flags for
every run.
The test for this is the cmd/go testsuite, to follow in a future CL.
Reviewed-on: https://go-review.googlesource.com/45692
From-SVN: r249199
Diffstat (limited to 'gcc/go')
-rw-r--r-- | gcc/go/gofrontend/MERGE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index f1055bc..1f600d3 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -bc785455a35bfa7d4b0a66781c7c3ef08a24a845 +372e75503c1dc9a38d9978aa6b67631283d5d6dd The first line of this file holds the git revision number of the last merge done from the gofrontend repository. |