FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR java/60261 (Weird java install with --enable-version-specific-runtime-libs)

Browse source 
2014-02-20  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.

From-SVN: r207936
This commit is contained in:
Richard Biener 2014-02-20 08:43:04 +00:00 • committed by Richard Biener
parent bd93695145
commit 1f58214aa2
5 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libjava/ChangeLog
View file

@ -1,3 +1,11 @@
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

1
libjava/Makefile.am
View file

@ -6,6 +6,7 @@ ACLOCAL_AMFLAGS = -I . -I .. -I ../config -I libltdl
# 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

1
libjava/Makefile.in
View file

@ -10581,6 +10581,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-libexecsubPROGRAMS uninstall-toolexeclibLTLIBRARIES \
uninstall-toolexecmainlibDATA
export gcc_version
interpret.lo: AM_CXXFLAGS += -fwrapv
prims.lo: AM_CXXFLAGS += -fno-omit-frame-pointer

10
libjava/configure vendored
View file

@ -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

10
libjava/configure.ac
View file

@ -1596,15 +1596,7 @@ AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID])
# 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)