I have committed this patch to gotools to add compiler options to
allow the compilers under test to pick up the C++ library. This
permits tests to use C++ (linked into Go programs) which I used for a
test that I will commit shortly. Bootstrapped and ran Go testsuite on
x86_64-pc-linux-gnu. Committed to mainline.
Ian
2018-02-08 Ian Lance Taylor <i...@golang.org>
* Makefile.am (check-gccgo, check-gcc): Add options to pick up
target libstdc++, to permit tests that use C++.
* Makefile.in: Rebuild.
Index: Makefile.am
===================================================================
--- Makefile.am (revision 257493)
+++ Makefile.am (working copy)
@@ -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 $@
