re PR go/48410 (weird installation dir)
PR go/48410 libgo: Don't put .gox files in version-specific directory. From-SVN: r184223
This commit is contained in:
parent
2b120fe98e
commit
317ea7c0f4
|
@ -25,6 +25,7 @@ STAMP = echo timestamp >
|
||||||
|
|
||||||
toolexecdir = $(glibgo_toolexecdir)
|
toolexecdir = $(glibgo_toolexecdir)
|
||||||
toolexeclibdir = $(glibgo_toolexeclibdir)
|
toolexeclibdir = $(glibgo_toolexeclibdir)
|
||||||
|
toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias)
|
||||||
|
|
||||||
LIBFFI = @LIBFFI@
|
LIBFFI = @LIBFFI@
|
||||||
LIBFFIINCS = @LIBFFIINCS@
|
LIBFFIINCS = @LIBFFIINCS@
|
||||||
|
@ -97,8 +98,6 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
|
||||||
toolexeclib_LTLIBRARIES = libgo.la
|
toolexeclib_LTLIBRARIES = libgo.la
|
||||||
toolexeclib_LIBRARIES = libgobegin.a
|
toolexeclib_LIBRARIES = libgobegin.a
|
||||||
|
|
||||||
toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias)
|
|
||||||
|
|
||||||
toolexeclibgo_DATA = \
|
toolexeclibgo_DATA = \
|
||||||
bufio.gox \
|
bufio.gox \
|
||||||
bytes.gox \
|
bytes.gox \
|
||||||
|
|
|
@ -451,7 +451,6 @@ dvidir = @dvidir@
|
||||||
enable_shared = @enable_shared@
|
enable_shared = @enable_shared@
|
||||||
enable_static = @enable_static@
|
enable_static = @enable_static@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
glibgo_prefixdir = @glibgo_prefixdir@
|
|
||||||
glibgo_toolexecdir = @glibgo_toolexecdir@
|
glibgo_toolexecdir = @glibgo_toolexecdir@
|
||||||
glibgo_toolexeclibdir = @glibgo_toolexeclibdir@
|
glibgo_toolexeclibdir = @glibgo_toolexeclibdir@
|
||||||
go_include = @go_include@
|
go_include = @go_include@
|
||||||
|
@ -472,6 +471,7 @@ localstatedir = @localstatedir@
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
mkdir_p = @mkdir_p@
|
mkdir_p = @mkdir_p@
|
||||||
multi_basedir = @multi_basedir@
|
multi_basedir = @multi_basedir@
|
||||||
|
nover_glibgo_toolexeclibdir = @nover_glibgo_toolexeclibdir@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
|
@ -501,6 +501,7 @@ PWD_COMMAND = $${PWDCMD-pwd}
|
||||||
STAMP = echo timestamp >
|
STAMP = echo timestamp >
|
||||||
toolexecdir = $(glibgo_toolexecdir)
|
toolexecdir = $(glibgo_toolexecdir)
|
||||||
toolexeclibdir = $(glibgo_toolexeclibdir)
|
toolexeclibdir = $(glibgo_toolexeclibdir)
|
||||||
|
toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias)
|
||||||
WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
|
WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
|
||||||
|
|
||||||
# -I/-D flags to pass when compiling.
|
# -I/-D flags to pass when compiling.
|
||||||
|
@ -564,7 +565,6 @@ AM_MAKEFLAGS = \
|
||||||
FLAGS_TO_PASS = $(AM_MAKEFLAGS)
|
FLAGS_TO_PASS = $(AM_MAKEFLAGS)
|
||||||
toolexeclib_LTLIBRARIES = libgo.la
|
toolexeclib_LTLIBRARIES = libgo.la
|
||||||
toolexeclib_LIBRARIES = libgobegin.a
|
toolexeclib_LIBRARIES = libgobegin.a
|
||||||
toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias)
|
|
||||||
toolexeclibgo_DATA = \
|
toolexeclibgo_DATA = \
|
||||||
bufio.gox \
|
bufio.gox \
|
||||||
bytes.gox \
|
bytes.gox \
|
||||||
|
|
|
@ -671,9 +671,9 @@ LIBGO_IS_DARWIN_TRUE
|
||||||
go_include
|
go_include
|
||||||
LIBFFIINCS
|
LIBFFIINCS
|
||||||
LIBFFI
|
LIBFFI
|
||||||
|
nover_glibgo_toolexeclibdir
|
||||||
glibgo_toolexeclibdir
|
glibgo_toolexeclibdir
|
||||||
glibgo_toolexecdir
|
glibgo_toolexecdir
|
||||||
glibgo_prefixdir
|
|
||||||
WERROR
|
WERROR
|
||||||
WARN_FLAGS
|
WARN_FLAGS
|
||||||
CC_FOR_BUILD
|
CC_FOR_BUILD
|
||||||
|
@ -13391,7 +13391,6 @@ WERROR="-Werror"
|
||||||
|
|
||||||
glibgo_toolexecdir=no
|
glibgo_toolexecdir=no
|
||||||
glibgo_toolexeclibdir=no
|
glibgo_toolexeclibdir=no
|
||||||
glibgo_prefixdir=$prefix
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-version-specific-runtime-libs" >&5
|
{ $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; }
|
$as_echo_n "checking for --enable-version-specific-runtime-libs... " >&6; }
|
||||||
|
@ -13417,20 +13416,23 @@ fi
|
||||||
|
|
||||||
# Calculate glibgo_toolexecdir, glibgo_toolexeclibdir
|
# Calculate glibgo_toolexecdir, glibgo_toolexeclibdir
|
||||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
# 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 x"$glibgo_toolexecdir" = x"no"; then
|
||||||
if test -n "$with_cross_host" &&
|
glibgo_toolexecdir="${nover_glibgo_toolexecdir}"
|
||||||
test x"$with_cross_host" != x"no"; then
|
glibgo_toolexeclibdir="${nover_glibgo_toolexeclibdir}"
|
||||||
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
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,6 @@ AC_SUBST(WERROR)
|
||||||
|
|
||||||
glibgo_toolexecdir=no
|
glibgo_toolexecdir=no
|
||||||
glibgo_toolexeclibdir=no
|
glibgo_toolexeclibdir=no
|
||||||
glibgo_prefixdir=$prefix
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
|
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
|
||||||
AC_ARG_ENABLE([version-specific-runtime-libs],
|
AC_ARG_ENABLE([version-specific-runtime-libs],
|
||||||
|
@ -80,25 +79,28 @@ fi
|
||||||
|
|
||||||
# Calculate glibgo_toolexecdir, glibgo_toolexeclibdir
|
# Calculate glibgo_toolexecdir, glibgo_toolexeclibdir
|
||||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
# 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 x"$glibgo_toolexecdir" = x"no"; then
|
||||||
if test -n "$with_cross_host" &&
|
glibgo_toolexecdir="${nover_glibgo_toolexecdir}"
|
||||||
test x"$with_cross_host" != x"no"; then
|
glibgo_toolexeclibdir="${nover_glibgo_toolexeclibdir}"
|
||||||
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
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(glibgo_prefixdir)
|
|
||||||
AC_SUBST(glibgo_toolexecdir)
|
AC_SUBST(glibgo_toolexecdir)
|
||||||
AC_SUBST(glibgo_toolexeclibdir)
|
AC_SUBST(glibgo_toolexeclibdir)
|
||||||
|
AC_SUBST(nover_glibgo_toolexeclibdir)
|
||||||
|
|
||||||
# See if the user wants to configure without libffi. Some
|
# See if the user wants to configure without libffi. Some
|
||||||
# architectures don't support it. FIXME: We should set a default
|
# architectures don't support it. FIXME: We should set a default
|
||||||
|
|
|
@ -167,7 +167,6 @@ dvidir = @dvidir@
|
||||||
enable_shared = @enable_shared@
|
enable_shared = @enable_shared@
|
||||||
enable_static = @enable_static@
|
enable_static = @enable_static@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
glibgo_prefixdir = @glibgo_prefixdir@
|
|
||||||
glibgo_toolexecdir = @glibgo_toolexecdir@
|
glibgo_toolexecdir = @glibgo_toolexecdir@
|
||||||
glibgo_toolexeclibdir = @glibgo_toolexeclibdir@
|
glibgo_toolexeclibdir = @glibgo_toolexeclibdir@
|
||||||
go_include = @go_include@
|
go_include = @go_include@
|
||||||
|
@ -188,6 +187,7 @@ localstatedir = @localstatedir@
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
mkdir_p = @mkdir_p@
|
mkdir_p = @mkdir_p@
|
||||||
multi_basedir = @multi_basedir@
|
multi_basedir = @multi_basedir@
|
||||||
|
nover_glibgo_toolexeclibdir = @nover_glibgo_toolexeclibdir@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
|
|
Loading…
Reference in New Issue