From 080eaf7a88ee8039b6acf6c10394db18e9f34615 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 8 Feb 2018 15:34:42 +0000 Subject: [PATCH] Makefile.am (check-gccgo, check-gcc): Add options to pick up target libstdc++, to permit tests that use C++. * Makefile.am (check-gccgo, check-gcc): Add options to pick up target libstdc++, to permit tests that use C++. * Makefile.in: Rebuild. From-SVN: r257494 --- gotools/ChangeLog | 6 ++++++ gotools/Makefile.am | 8 ++++---- gotools/Makefile.in | 10 +++++----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gotools/ChangeLog b/gotools/ChangeLog index 400ef832ffb..77bd206601c 100644 --- a/gotools/ChangeLog +++ b/gotools/ChangeLog @@ -1,3 +1,9 @@ +2018-02-08 Ian Lance Taylor + + * Makefile.am (check-gccgo, check-gcc): Add options to pick up + target libstdc++, to permit tests that use C++. + * Makefile.in: Rebuild. + 2018-01-18 Ian Lance Taylor * Makefile.am (GOTOOLS_TEST_TIMEOUT): Define. diff --git a/gotools/Makefile.am b/gotools/Makefile.am index 2738cc2c885..d0d8850f550 100644 --- a/gotools/Makefile.am +++ b/gotools/Makefile.am @@ -179,22 +179,22 @@ check-head: @echo >> gotools.head # check-gccgo is a little shell script that executes gccgo with the -# options to pick up the newly built libgo. +# options to pick up the newly built libgo and libstdc++. check-gccgo: Makefile rm -f $@ $@.tmp echo "#!/bin/sh" > $@.tmp abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \ - echo "$(GOCOMPILE)" '"$$@"' "-I $${abs_libgodir} -L $${abs_libgodir} -L $${abs_libgodir}/.libs" >> $@.tmp + echo "$(GOCOMPILE)" '"$$@"' "-I $${abs_libgodir} -L $${abs_libgodir} -L $${abs_libgodir}/.libs -B$${abs_libgodir}/../libstdc++-v3/src/.libs -B$${abs_libgodir}/../libstdc++-v3/libsupc++/.libs" >> $@.tmp chmod +x $@.tmp mv -f $@.tmp $@ # check-gcc is a little shell script that executes the newly built gcc -# with the options to pick up the newly built libgo. +# with the options to pick up the newly built libgo and libstdc++. check-gcc: Makefile rm -f $@ $@.tmp echo "#!/bin/sh" > $@.tmp abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \ - echo "$(GCC_FOR_TARGET)" '"$$@"' "-L $${abs_libgodir} -L $${abs_libgodir}/.libs" >> $@.tmp + echo "$(GCC_FOR_TARGET)" '"$$@"' "-L $${abs_libgodir} -L $${abs_libgodir}/.libs -B$${abs_libgodir}/../libstdc++-v3/src/.libs -B$${abs_libgodir}/../libstdc++-v3/libsupc++/.libs" >> $@.tmp chmod +x $@.tmp mv -f $@.tmp $@ diff --git a/gotools/Makefile.in b/gotools/Makefile.in index 3925eb44f21..dfef748d7a5 100644 --- a/gotools/Makefile.in +++ b/gotools/Makefile.in @@ -635,8 +635,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@NATIVE_FALSE@uninstall-local: @NATIVE_FALSE@install-exec-local: +@NATIVE_FALSE@uninstall-local: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \ @@ -784,22 +784,22 @@ mostlyclean-local: @NATIVE_TRUE@ @echo >> gotools.head # check-gccgo is a little shell script that executes gccgo with the -# options to pick up the newly built libgo. +# options to pick up the newly built libgo and libstdc++. @NATIVE_TRUE@check-gccgo: Makefile @NATIVE_TRUE@ rm -f $@ $@.tmp @NATIVE_TRUE@ echo "#!/bin/sh" > $@.tmp @NATIVE_TRUE@ abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \ -@NATIVE_TRUE@ echo "$(GOCOMPILE)" '"$$@"' "-I $${abs_libgodir} -L $${abs_libgodir} -L $${abs_libgodir}/.libs" >> $@.tmp +@NATIVE_TRUE@ echo "$(GOCOMPILE)" '"$$@"' "-I $${abs_libgodir} -L $${abs_libgodir} -L $${abs_libgodir}/.libs -B$${abs_libgodir}/../libstdc++-v3/src/.libs -B$${abs_libgodir}/../libstdc++-v3/libsupc++/.libs" >> $@.tmp @NATIVE_TRUE@ chmod +x $@.tmp @NATIVE_TRUE@ mv -f $@.tmp $@ # check-gcc is a little shell script that executes the newly built gcc -# with the options to pick up the newly built libgo. +# with the options to pick up the newly built libgo and libstdc++. @NATIVE_TRUE@check-gcc: Makefile @NATIVE_TRUE@ rm -f $@ $@.tmp @NATIVE_TRUE@ echo "#!/bin/sh" > $@.tmp @NATIVE_TRUE@ abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \ -@NATIVE_TRUE@ echo "$(GCC_FOR_TARGET)" '"$$@"' "-L $${abs_libgodir} -L $${abs_libgodir}/.libs" >> $@.tmp +@NATIVE_TRUE@ echo "$(GCC_FOR_TARGET)" '"$$@"' "-L $${abs_libgodir} -L $${abs_libgodir}/.libs -B$${abs_libgodir}/../libstdc++-v3/src/.libs -B$${abs_libgodir}/../libstdc++-v3/libsupc++/.libs" >> $@.tmp @NATIVE_TRUE@ chmod +x $@.tmp @NATIVE_TRUE@ mv -f $@.tmp $@ -- 2.30.2