PR libjava/60261
* configure.ac (dbexecdir): Remove redundant multilib addition.
* Makefile.am (gcc_version): Export.
* configure: Regenerate.
* Makefile.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@207936
138bc75d-0d04-0410-961f-
82ee72b054a4
+2014-02-18 Richard Biener <rguenther@suse.de>
+
+ PR libjava/60261
+ * configure.ac (dbexecdir): Remove redundant multilib addition.
+ * Makefile.am (gcc_version): Export.
+ * configure: Regenerate.
+ * Makefile.in: Likewise.
+
2014-01-02 Tobias Burnus <burnus@net-b.de>
* gnu/gcj/convert/Convert.java (version): Update copyright notice
# 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
uninstall-libexecsubPROGRAMS uninstall-toolexeclibLTLIBRARIES \
uninstall-toolexecmainlibDATA
+export gcc_version
interpret.lo: AM_CXXFLAGS += -fwrapv
prims.lo: AM_CXXFLAGS += -fno-omit-frame-pointer
# 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
# 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)