aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-11-06 20:59:32 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-11-06 20:59:32 +0000
commitce995d1cc294c195c5a58061369ffdd4e2f4dea0 (patch)
tree9e7ad9d15cfb32af7a4bb21b9590a729bc5b2115
parent8094001759f757a5dc7ce375e4d1e5fd0d9a2a8e (diff)
downloadgcc-ce995d1cc294c195c5a58061369ffdd4e2f4dea0.zip
gcc-ce995d1cc294c195c5a58061369ffdd4e2f4dea0.tar.gz
gcc-ce995d1cc294c195c5a58061369ffdd4e2f4dea0.tar.bz2
libgo: pass flags to recursive make
"make check" runs make recursively to check each package. Pass the flags through. So it is possible to run "make check" with different settings easily. Reviewed-on: https://go-review.googlesource.com/76029 From-SVN: r254475
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/Makefile.am4
-rw-r--r--libgo/Makefile.in4
3 files changed, 5 insertions, 5 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 0fa2ccc..9168d1f 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -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.
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index bd0bbdd..9bbda2d 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -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 \
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 064df58..fa9da93 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -3446,7 +3446,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; \
@@ -3460,7 +3460,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=.
mostlyclean-local:
find . -name '*.lo' -print | xargs $(LIBTOOL) --mode=clean rm -f