aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libgo/Makefile.am2
-rw-r--r--libgo/Makefile.in2
-rwxr-xr-xlibgo/configure2
-rw-r--r--libgo/configure.ac2
4 files changed, 4 insertions, 4 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 4f09bc3..efdeeab 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -962,7 +962,7 @@ s-version: Makefile
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 --git a/libgo/Makefile.in b/libgo/Makefile.in
index cf93938..1b3aedf 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -4357,7 +4357,7 @@ s-version: Makefile
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 --git a/libgo/configure b/libgo/configure
index 81936a8..c477021 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -13444,7 +13444,7 @@ else
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} ;;
diff --git a/libgo/configure.ac b/libgo/configure.ac
index 6f59c03..e4e4b60 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -88,7 +88,7 @@ else
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} ;;