aboutsummaryrefslogtreecommitdiff
path: root/gotools/Makefile.am
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2018-02-08 15:34:42 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-02-08 15:34:42 +0000
commit080eaf7a88ee8039b6acf6c10394db18e9f34615 (patch)
treea34b8a435f5555470d77cc753ac80180203bbb46 /gotools/Makefile.am
parent9adab5dd169afd191efd1dcbf50dae0f726a0a42 (diff)
downloadgcc-080eaf7a88ee8039b6acf6c10394db18e9f34615.zip
gcc-080eaf7a88ee8039b6acf6c10394db18e9f34615.tar.gz
gcc-080eaf7a88ee8039b6acf6c10394db18e9f34615.tar.bz2
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
Diffstat (limited to 'gotools/Makefile.am')
-rw-r--r--gotools/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index 2738cc2..d0d8850 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 $@