The following two pieces fix the fallout of
2013-05-22 Mark Mitchell <m...@codesourcery.com>
Sandra Loosemore <san...@codesourcery.com>
* configure.ac (dbexecdir): Base on $(toolexeclibdir), not
$(libdir).
...
that makes a wreck out of my 4.9-based libjava installs.
First it avoids to break dbexecdir with MULTSUBDIR= by removing
the redundant but non-version-specific-aware multilib addition.
Second, it makes sure that gcc_version, used in the
version-specific path, is defined at all in classpath/ and its
subdirs.
Tested for my particular configuration, I'll do a default,
non-version-specific one as well (but expect no changes).
Ok for trunk?
Thanks,
Richard.
2014-02-18 Richard Biener <rguent...@suse.de>
PR libjava/60261
* configure.ac (dbexecdir): Remove redundant multilib addition.
* Makefile.am (gcc_version): Export.
* configure: Regenerate.
* Makefile.in: Likewise.
Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac (revision 207837)
+++ libjava/configure.ac (working copy)
@@ -1596,15 +1596,7 @@ AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERS
# Determine where the standard .db file and GNU Classpath JNI
# libraries are found.
gcjsubdir=gcj-$gcjversion-$libgcj_soversion
-multi_os_directory=`$CC -print-multi-os-directory`
-case $multi_os_directory in
- .)
- dbexecdir='$(toolexeclibdir)/'$gcjsubdir # Avoid /.
- ;;
- *)
- dbexecdir='$(toolexeclibdir)/'$multi_os_directory/$gcjsubdir
- ;;
-esac
+dbexecdir='$(toolexeclibdir)/'$gcjsubdir
AC_SUBST(dbexecdir)
AC_SUBST(gcjsubdir)
Index: libjava/configure
===================================================================
--- libjava/configure (revision 207837)
+++ libjava/configure (working copy)
@@ -24016,15 +24016,7 @@ _ACEOF
# Determine where the standard .db file and GNU Classpath JNI
# libraries are found.
gcjsubdir=gcj-$gcjversion-$libgcj_soversion
-multi_os_directory=`$CC -print-multi-os-directory`
-case $multi_os_directory in
- .)
- dbexecdir='$(toolexeclibdir)/'$gcjsubdir # Avoid /.
- ;;
- *)
- dbexecdir='$(toolexeclibdir)/'$multi_os_directory/$gcjsubdir
- ;;
-esac
+dbexecdir='$(toolexeclibdir)/'$gcjsubdir
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am (revision 207837)
+++ libjava/Makefile.am (working copy)
@@ -6,6 +6,7 @@ ACLOCAL_AMFLAGS = -I . -I .. -I ../confi
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+export gcc_version
SUBDIRS = $(DIRLTDL) gcj include classpath
if TESTSUBDIR
Index: libjava/Makefile.in
===================================================================
--- libjava/Makefile.in (revision 207837)
+++ libjava/Makefile.in (working copy)
@@ -10581,6 +10581,7 @@ uninstall-am: uninstall-binPROGRAMS unin
uninstall-libexecsubPROGRAMS uninstall-toolexeclibLTLIBRARIES \
uninstall-toolexecmainlibDATA
+export gcc_version
interpret.lo: AM_CXXFLAGS += -fwrapv
prims.lo: AM_CXXFLAGS += -fno-omit-frame-pointer
