This patch by Cherry Zhang explicitly passes AM_MAKEFLAGS to a couple
of recursive makes in the libgo Makefile, to make sure they are
available.  Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu.
Committed to mainline.

Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE     (revision 254126)
+++ gcc/go/gofrontend/MERGE     (working copy)
@@ -1,4 +1,4 @@
-64d570c590a76921cbdca4efb22e4675e19cc809
+b9885a251ae2c43252926dbe1960df5640aa469b
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
Index: libgo/Makefile.am
===================================================================
--- libgo/Makefile.am   (revision 254090)
+++ libgo/Makefile.am   (working copy)
@@ -1474,7 +1474,7 @@ check-am:
        @for f in $(TEST_PACKAGES); do \
           rm -f $$f-testsum $$f-testlog; \
         done
-       -@$(MAKE) -k $(TEST_PACKAGES)
+       -@$(MAKE) $(AM_MAKEFLAGS) -k $(TEST_PACKAGES)
        @for f in $(TEST_PACKAGES); do \
          if test -f $$f-testsum; then \
            cat $$f-testsum >> libgo.sum; \
@@ -1488,7 +1488,7 @@ check-multi:
        $(MULTIDO) $(AM_MAKEFLAGS) DO=check-am multi-do # $(MAKE)
 
 bench:
-       -@$(MAKE) -k $(TEST_PACKAGES) GOBENCH=.
+       -@$(MAKE) $(AM_MAKEFLAGS) -k $(TEST_PACKAGES) GOBENCH=.
 
 MOSTLYCLEANFILES = \
        s-runtime_sysinfo s-sigtab s-runtime-inc s-zstdpkglist \

Reply via email to