This patch from Peter Collingbourne changes the libgo configury and make
to test $GOC (the target gccgo) for compiler characteristics rather than
$CC. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu.
Committed to mainline.
Ian
diff -r 703f1d4d9227 libgo/Makefile.am
--- a/libgo/Makefile.am Wed Apr 30 13:54:36 2014 -0400
+++ b/libgo/Makefile.am Wed Apr 30 20:22:56 2014 -0400
@@ -962,7 +962,7 @@
rm -f version.go.tmp
echo "package runtime" > version.go.tmp
echo 'const defaultGoroot = "$(prefix)"' >> version.go.tmp
- echo 'const theVersion = "'`$(CC) --version | sed 1q`'"' >> version.go.tmp
+ echo 'const theVersion = "'`$(GOC) --version | sed 1q`'"' >> version.go.tmp
echo 'const theGoarch = "'$(GOARCH)'"' >> version.go.tmp
echo 'const theGoos = "'$(GOOS)'"' >> version.go.tmp
$(SHELL) $(srcdir)/../move-if-change version.go.tmp version.go
diff -r 703f1d4d9227 libgo/configure.ac
--- a/libgo/configure.ac Wed Apr 30 13:54:36 2014 -0400
+++ b/libgo/configure.ac Wed Apr 30 20:22:56 2014 -0400
@@ -88,7 +88,7 @@
nover_glibgo_toolexecdir='${libdir}/gcc/${host_alias}'
nover_glibgo_toolexeclibdir='${libdir}'
fi
-multi_os_directory=`$CC -print-multi-os-directory`
+multi_os_directory=`$GOC -print-multi-os-directory`
case $multi_os_directory in
.) ;; # Avoid trailing /.
*) nover_glibgo_toolexeclibdir=${nover_glibgo_toolexeclibdir}/${multi_os_directory} ;;
