diff options
author | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-02-14 19:40:09 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-02-14 19:40:09 +0000 |
commit | 317ea7c0f44135b03b5dc1827532004ef86d72e0 (patch) | |
tree | ac078a0e02e9c32f7674fa05823f2b151584da6e /libgo | |
parent | 2b120fe98e786016576a60b30d0e0a3e3c780c78 (diff) | |
download | gcc-317ea7c0f44135b03b5dc1827532004ef86d72e0.zip gcc-317ea7c0f44135b03b5dc1827532004ef86d72e0.tar.gz gcc-317ea7c0f44135b03b5dc1827532004ef86d72e0.tar.bz2 |
re PR go/48410 (weird installation dir)
PR go/48410
libgo: Don't put .gox files in version-specific directory.
From-SVN: r184223
Diffstat (limited to 'libgo')
-rw-r--r-- | libgo/Makefile.am | 3 | ||||
-rw-r--r-- | libgo/Makefile.in | 4 | ||||
-rwxr-xr-x | libgo/configure | 32 | ||||
-rw-r--r-- | libgo/configure.ac | 32 | ||||
-rw-r--r-- | libgo/testsuite/Makefile.in | 2 |
5 files changed, 38 insertions, 35 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 300d16b..2e874df 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -25,6 +25,7 @@ STAMP = echo timestamp > toolexecdir = $(glibgo_toolexecdir) toolexeclibdir = $(glibgo_toolexeclibdir) +toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias) LIBFFI = @LIBFFI@ LIBFFIINCS = @LIBFFIINCS@ @@ -97,8 +98,6 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) toolexeclib_LTLIBRARIES = libgo.la toolexeclib_LIBRARIES = libgobegin.a -toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias) - toolexeclibgo_DATA = \ bufio.gox \ bytes.gox \ diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 797ccca..50195cc 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -451,7 +451,6 @@ dvidir = @dvidir@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ -glibgo_prefixdir = @glibgo_prefixdir@ glibgo_toolexecdir = @glibgo_toolexecdir@ glibgo_toolexeclibdir = @glibgo_toolexeclibdir@ go_include = @go_include@ @@ -472,6 +471,7 @@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ multi_basedir = @multi_basedir@ +nover_glibgo_toolexeclibdir = @nover_glibgo_toolexeclibdir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -501,6 +501,7 @@ PWD_COMMAND = $${PWDCMD-pwd} STAMP = echo timestamp > toolexecdir = $(glibgo_toolexecdir) toolexeclibdir = $(glibgo_toolexeclibdir) +toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias) WARN_CFLAGS = $(WARN_FLAGS) $(WERROR) # -I/-D flags to pass when compiling. @@ -564,7 +565,6 @@ AM_MAKEFLAGS = \ FLAGS_TO_PASS = $(AM_MAKEFLAGS) toolexeclib_LTLIBRARIES = libgo.la toolexeclib_LIBRARIES = libgobegin.a -toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias) toolexeclibgo_DATA = \ bufio.gox \ bytes.gox \ diff --git a/libgo/configure b/libgo/configure index 1ce89d2..9bbdfe9 100755 --- a/libgo/configure +++ b/libgo/configure @@ -671,9 +671,9 @@ LIBGO_IS_DARWIN_TRUE go_include LIBFFIINCS LIBFFI +nover_glibgo_toolexeclibdir glibgo_toolexeclibdir glibgo_toolexecdir -glibgo_prefixdir WERROR WARN_FLAGS CC_FOR_BUILD @@ -13391,7 +13391,6 @@ WERROR="-Werror" glibgo_toolexecdir=no glibgo_toolexeclibdir=no -glibgo_prefixdir=$prefix { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-version-specific-runtime-libs" >&5 $as_echo_n "checking for --enable-version-specific-runtime-libs... " >&6; } @@ -13417,20 +13416,23 @@ fi # Calculate glibgo_toolexecdir, glibgo_toolexeclibdir # Install a library built with a cross compiler in tooldir, not libdir. +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + nover_glibgo_toolexecdir='${exec_prefix}/${host_alias}' + nover_glibgo_toolexeclibdir='${toolexecdir}/lib' +else + nover_glibgo_toolexecdir='${libdir}/gcc/${host_alias}' + nover_glibgo_toolexeclibdir='${libdir}' +fi +multi_os_directory=`$CC -print-multi-os-directory` +case $multi_os_directory in + .) ;; # Avoid trailing /. + *) nover_glibgo_toolexeclibdir=${nover_glibgo_toolexeclibdir}/${multi_os_directory} ;; +esac + if test x"$glibgo_toolexecdir" = x"no"; then - if test -n "$with_cross_host" && - test x"$with_cross_host" != x"no"; then - glibgo_toolexecdir='${exec_prefix}/${host_alias}' - glibgo_toolexeclibdir='${toolexecdir}/lib' - else - glibgo_toolexecdir='${libdir}/gcc/${host_alias}' - glibgo_toolexeclibdir='${libdir}' - fi - multi_os_directory=`$CC -print-multi-os-directory` - case $multi_os_directory in - .) ;; # Avoid trailing /. - *) glibgo_toolexeclibdir=$glibgo_toolexeclibdir/$multi_os_directory ;; - esac + glibgo_toolexecdir="${nover_glibgo_toolexecdir}" + glibgo_toolexeclibdir="${nover_glibgo_toolexeclibdir}" fi diff --git a/libgo/configure.ac b/libgo/configure.ac index c3c1f5e..249918b 100644 --- a/libgo/configure.ac +++ b/libgo/configure.ac @@ -58,7 +58,6 @@ AC_SUBST(WERROR) glibgo_toolexecdir=no glibgo_toolexeclibdir=no -glibgo_prefixdir=$prefix AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) AC_ARG_ENABLE([version-specific-runtime-libs], @@ -80,25 +79,28 @@ fi # Calculate glibgo_toolexecdir, glibgo_toolexeclibdir # Install a library built with a cross compiler in tooldir, not libdir. +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + nover_glibgo_toolexecdir='${exec_prefix}/${host_alias}' + nover_glibgo_toolexeclibdir='${toolexecdir}/lib' +else + nover_glibgo_toolexecdir='${libdir}/gcc/${host_alias}' + nover_glibgo_toolexeclibdir='${libdir}' +fi +multi_os_directory=`$CC -print-multi-os-directory` +case $multi_os_directory in + .) ;; # Avoid trailing /. + *) nover_glibgo_toolexeclibdir=${nover_glibgo_toolexeclibdir}/${multi_os_directory} ;; +esac + if test x"$glibgo_toolexecdir" = x"no"; then - if test -n "$with_cross_host" && - test x"$with_cross_host" != x"no"; then - glibgo_toolexecdir='${exec_prefix}/${host_alias}' - glibgo_toolexeclibdir='${toolexecdir}/lib' - else - glibgo_toolexecdir='${libdir}/gcc/${host_alias}' - glibgo_toolexeclibdir='${libdir}' - fi - multi_os_directory=`$CC -print-multi-os-directory` - case $multi_os_directory in - .) ;; # Avoid trailing /. - *) glibgo_toolexeclibdir=$glibgo_toolexeclibdir/$multi_os_directory ;; - esac + glibgo_toolexecdir="${nover_glibgo_toolexecdir}" + glibgo_toolexeclibdir="${nover_glibgo_toolexeclibdir}" fi -AC_SUBST(glibgo_prefixdir) AC_SUBST(glibgo_toolexecdir) AC_SUBST(glibgo_toolexeclibdir) +AC_SUBST(nover_glibgo_toolexeclibdir) # See if the user wants to configure without libffi. Some # architectures don't support it. FIXME: We should set a default diff --git a/libgo/testsuite/Makefile.in b/libgo/testsuite/Makefile.in index e9269d9..4628fdd 100644 --- a/libgo/testsuite/Makefile.in +++ b/libgo/testsuite/Makefile.in @@ -167,7 +167,6 @@ dvidir = @dvidir@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ -glibgo_prefixdir = @glibgo_prefixdir@ glibgo_toolexecdir = @glibgo_toolexecdir@ glibgo_toolexeclibdir = @glibgo_toolexeclibdir@ go_include = @go_include@ @@ -188,6 +187,7 @@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ multi_basedir = @multi_basedir@ +nover_glibgo_toolexeclibdir = @nover_glibgo_toolexeclibdir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ |