diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-14 19:40:09 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-14 19:40:09 +0000 |
| commit | 61efdf66b41c68d623fc77ddf11d1169a5cb606d (patch) | |
| tree | ac078a0e02e9c32f7674fa05823f2b151584da6e /libgo/configure.ac | |
| parent | ff902caea508c708075f166f365e327695064842 (diff) | |
| download | gcc-61efdf66b41c68d623fc77ddf11d1169a5cb606d.tar.gz | |
PR go/48410
libgo: Don't put .gox files in version-specific directory.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184223 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/configure.ac')
| -rw-r--r-- | libgo/configure.ac | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/libgo/configure.ac b/libgo/configure.ac index c3c1f5e9452..249918b15d0 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 |