OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Ian Lance Taylor 2018-02-08 15:34:42 +00:00 committed by Ian Lance Taylor
parent 9adab5dd16
commit 080eaf7a88
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gotools/ChangeLog
View File

@ -1,3 +1,9 @@
2018-02-08 Ian Lance Taylor <iant@golang.org>
* 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 <iant@golang.org>
* Makefile.am (GOTOOLS_TEST_TIMEOUT): Define.

8
gotools/Makefile.am
View File

@ -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 $@

10
gotools/Makefile.in
View File

@ -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 $@