testmain.exp: link against GOLIBS

    Patch by Maciej W. Rozycki.

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/207458

From-SVN: r278316

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 84a5db844e196b5aa2cd5a778d7747d2b97c91c0..a981bb86c2d88c4914196e264e6449000bdc30f9 100644 (file)
--- 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 0b887ac3efdd7cfd3df94f40bb24db648410a51c..6dd5445e2a1d1e0b7863700847c7b3238b84a262 100644 (file)
--- 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