diff options
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libjava/configure b/libjava/configure index 9bd59274075..8fd9b65f7f6 100755 --- a/libjava/configure +++ b/libjava/configure @@ -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` |
