diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-11-15 21:14:29 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-11-15 21:14:29 +0000 |
| commit | ae0b0fc6ae46c47ec5003db8cc3b6eff75423c18 (patch) | |
| tree | 00747da9ce8d60cc3ae2478f2942f0e7615e5b84 | |
| parent | a31517cb9ababe3195888eb91e7c1aa821540fc4 (diff) | |
| download | gcc-ae0b0fc6ae46c47ec5003db8cc3b6eff75423c18.zip gcc-ae0b0fc6ae46c47ec5003db8cc3b6eff75423c18.tar.gz gcc-ae0b0fc6ae46c47ec5003db8cc3b6eff75423c18.tar.bz2 | |
testmain.exp: link against GOLIBS
Patch by Maciej W. Rozycki.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/207458
From-SVN: r278316
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/testsuite/libgo.testmain/testmain.exp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 84a5db8..a981bb8 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -2d0504236c7236345ee17a0cb43a3bb9ce3acf7f +25d5e9dca49ad3f49393b254dd87f8df51487c65 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/testsuite/libgo.testmain/testmain.exp b/libgo/testsuite/libgo.testmain/testmain.exp index 0b887ac..6dd5445 100644 --- a/libgo/testsuite/libgo.testmain/testmain.exp +++ b/libgo/testsuite/libgo.testmain/testmain.exp @@ -47,7 +47,11 @@ if [info exists gluefile] { regsub $gluefile $object_files "" object_files } -set comp_output [go_target_compile "$object_files _testmain.go" \ +set golibs "" +if [info exists env(GOLIBS)] { + set golibs "$env(GOLIBS)" +} +set comp_output [go_target_compile "$object_files _testmain.go $golibs" \ "./a.exe" "executable" $options] if ![ string match "" $comp_output ] { verbose -log $comp_output |