aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.in10
-rw-r--r--Makefile.tpl10
3 files changed, 19 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index c91d20b..1092380 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-13 Jason Merrill <jason@redhat.com>
+
+ * Makefile.tpl (check-gcc-c++): Renamed from check-c++. Don't run
+ library tests.
+ (check-c++): Just depend on it and check-target-libstdc++-v3.
+ * Makefile.in: Regenerate.
+
2002-12-13 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in, Makefile.tpl, Makefile.def: Remove tclX.
diff --git a/Makefile.in b/Makefile.in
index dfddbda..f7c3895 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7539,17 +7539,19 @@ check-gcc:
true; \
fi
-.PHONY: check-c++
-check-c++:
+.PHONY: check-gcc-c++
+check-gcc-c++:
@if [ -f ./gcc/Makefile ] ; then \
r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
- $(MAKE) check-target-libstdc++-v3; \
else \
true; \
- fi
+ fi
+
+.PHONY: check-c++
+check-c++: check-target-libstdc++-v3 check-gcc-c++
.PHONY: install-gcc maybe-install-gcc
maybe-install-gcc:
diff --git a/Makefile.tpl b/Makefile.tpl
index 3518079..9f64035 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1213,17 +1213,19 @@ check-gcc:
true; \
fi
-.PHONY: check-c++
-check-c++:
+.PHONY: check-gcc-c++
+check-gcc-c++:
@if [ -f ./gcc/Makefile ] ; then \
r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
- $(MAKE) check-target-libstdc++-v3; \
else \
true; \
- fi
+ fi
+
+.PHONY: check-c++
+check-c++: check-target-libstdc++-v3 check-gcc-c++
.PHONY: install-gcc maybe-install-gcc
maybe-install-gcc: