diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-05-11 16:23:44 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-05-11 17:27:46 -0700 |
| commit | 4f157ed7749fd13c3562dd09696f7d675b86434f (patch) | |
| tree | 8210b525b3773e6d9debf626e550d81beccdcef3 /gcc | |
| parent | b58c5e0c73424586b881cc5926c7b6fd9c7151f0 (diff) | |
| download | gcc-4f157ed7749fd13c3562dd09696f7d675b86434f.zip gcc-4f157ed7749fd13c3562dd09696f7d675b86434f.tar.gz gcc-4f157ed7749fd13c3562dd09696f7d675b86434f.tar.bz2 | |
syscall: append to environment in tests, don't clobber it
This is a partial backport of https://golang.org/cl/233318.
It's only a partial backport because part of the change was
already applied to libgo in CL 193497 as part of the update
to the Go 1.13beta1 release.
Fixes PR go/95061
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/233359
Diffstat (limited to 'gcc')
| -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 428b329..939ba7c 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -41019d50ae519328dd3cf200815a2a2b0b64674e +8645632618262d1661ece0c9e6fe9e04c6e3a878 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. |