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/configure | |
| 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/configure')
| -rwxr-xr-x | libgo/configure | 32 |
1 files changed, 17 insertions, 15 deletions
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 |