procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

runtime: ask $GOC rather than $CC for the version and multi-os-directory

Browse source 
The Go compiler may have different values for these than the C compiler.

From-SVN: r209967
This commit is contained in:
Ian Lance Taylor 2014-05-01 00:35:58 +00:00
parent 86f72d76d5
commit 6c76a95d1b
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libgo/Makefile.am
View file

@ -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

2
libgo/Makefile.in
View file

@ -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

2
libgo/configure vendored
View file

@ -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} ;;

2
libgo/configure.ac
View file

@ -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} ;;