configure.in: Use target_noncanonical rather than target_alias for forward-compatibility with...
* configure.in: Use target_noncanonical rather than target_alias for forward-compatibility with autoconf 2.59. * configure: Regenerate. * Makefile.am, gcj/Makefile.am, include/Makefile.am, testsuite/Makefile.am: Substitute target_noncanonical. * Makefile.in, gcj/Makefile.in, include/Makefile.in, testsuite/Makefile.in: Regenerate. From-SVN: r84802
This commit is contained in:
parent
50265400ed
commit
ed2e3d3395
11 changed files with 82 additions and 18 deletions
14
libjava/configure
vendored
14
libjava/configure
vendored
|
@ -4617,7 +4617,7 @@ GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
|
|||
gcc_version_trigger=${libgcj_basedir}/../gcc/version.c
|
||||
gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
|
||||
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
|
||||
tool_include_dir='$(libdir)/gcc/$(target_alias)/'${gcc_version}/include
|
||||
tool_include_dir='$(libdir)/gcc/$(target_noncanonical)/'${gcc_version}/include
|
||||
|
||||
|
||||
|
||||
|
@ -7194,9 +7194,9 @@ case "${which_gcj}" in
|
|||
if test "x${with_newlib}" = "xyes"; then
|
||||
# FIXME (comment): Why is this needed?
|
||||
GCC_UNWIND_INCLUDE=
|
||||
GCJ="${target_alias}-gcj"
|
||||
GCJ="${target_noncanonical}-gcj"
|
||||
else
|
||||
GCJ="${target_alias}-gcj -B`${PWDCMD-pwd}`/"
|
||||
GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
|
||||
fi
|
||||
;;
|
||||
path)
|
||||
|
@ -7433,8 +7433,8 @@ case ${version_specific_libs} in
|
|||
# Need the gcc compiler version to know where to install libraries
|
||||
# and header files if --enable-version-specific-runtime-libs option
|
||||
# is selected.
|
||||
includedir='${libdir}/gcc/${target_alias}/'$gcc_version/include/
|
||||
toolexecdir='$(libdir)/gcc/$(target_alias)'
|
||||
includedir='${libdir}/gcc/${target_noncanonical}/'$gcc_version/include/
|
||||
toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
|
||||
toolexecmainlibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
|
||||
toolexeclibdir=$toolexecmainlibdir
|
||||
;;
|
||||
|
@ -7442,10 +7442,10 @@ case ${version_specific_libs} in
|
|||
if test -n "$with_cross_host" &&
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexecdir='$(exec_prefix)/$(target_noncanonical)'
|
||||
toolexecmainlibdir='$(toolexecdir)/lib'
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
|
||||
toolexecmainlibdir='$(libdir)'
|
||||
fi
|
||||
multi_os_directory=`$CC -print-multi-os-directory`
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue