diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-05-01 00:35:58 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-05-01 00:35:58 +0000 |
| commit | 6c76a95d1b26ca4639b70aece82a6e6b50499536 (patch) | |
| tree | b01b9bb395e1233f02e8b95e2e9d56a1655eb53a | |
| parent | 86f72d76d59208459d648957e0a1653432d11d5f (diff) | |
| download | gcc-6c76a95d1b26ca4639b70aece82a6e6b50499536.zip gcc-6c76a95d1b26ca4639b70aece82a6e6b50499536.tar.gz gcc-6c76a95d1b26ca4639b70aece82a6e6b50499536.tar.bz2 | |
runtime: ask $GOC rather than $CC for the version and multi-os-directory
The Go compiler may have different values for these than the C compiler.
From-SVN: r209967
| -rw-r--r-- | libgo/Makefile.am | 2 | ||||
| -rw-r--r-- | libgo/Makefile.in | 2 | ||||
| -rwxr-xr-x | libgo/configure | 2 | ||||
| -rw-r--r-- | libgo/configure.ac | 2 |
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} ;; |