Properly install dummy libgcc_bc library

Message ID
State New
Headers show

Commit Message

Andreas Schwab Aug. 14, 2013, 10:30 a.m.
The rules to install the dummy libgcc_bc library have never worked as
intented, probably due to the fact that the fedora gcc package installs
it by hand, ignoring all damage that has been done.  The target that
creates for the testsuite is mucking around with internal
details that will confuse libtool when it tries to install it, the
effect of which can't be undone by install-exec-hook.  We need to create
a clean second copy that is actually installed.


	* (toolexeclib_LTLIBRARIES) [USE_LIBGCJ_BC]: Use
	install/ instead of
	(noinst_LTLIBRARIES) [USE_LIBGCJ_BC]: Define.
	(install_libgcj_bc_la_SOURCES): Define.
	(install/ New rule.
	* Regenerate.


diff --git a/libjava/ b/libjava/
index dce1bb0..5af58fa 100644
--- a/libjava/
+++ b/libjava/
@@ -212,7 +212,8 @@  LIBJAVA_CORE_EXTRA =
-toolexeclib_LTLIBRARIES +=
+toolexeclib_LTLIBRARIES += install/
@@ -606,6 +607,7 @@  lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS) \
 ## This lets us have one soname in BC objects and another in C++ ABI objects.
 ## This library is not linked against libgcj.
 libgcj_bc_la_SOURCES = libgcj_bc.c
+install_libgcj_bc_la_SOURCES = $(libgcj_bc_la_SOURCES)
 libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0 \
 libgcj_bc_la_DEPENDENCIES = $(libgcj_bc_la_version_dep)
@@ -628,6 +630,11 @@ $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES)
 	rm .libs/; \
 	$(LN_S) .libs/
+## This rule creates the libgcj_bc library that is actually installed.
+install/ $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES) install/$(am__dirstamp)
+	$(libgcj_bc_la_LINK) $(am_libgcj_bc_la_rpath) $(libgcj_bc_la_LDFLAGS) \
+	$(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_LIBADD) $(LIBS)
 ## Note that property_files is defined in
 propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files)))