| 5384b728 |
1 | --- libjava/Makefile.am.jj Tue Jun 4 20:41:44 2002 |
| 2 | +++ libjava/Makefile.am Wed Jun 5 15:20:30 2002 |
| 3 | @@ -111,6 +111,8 @@ INCLUDES = -I$(top_srcdir) -Iinclude -I$ |
| 4 | |
| 5 | ## ################################################################ |
| 6 | |
| 7 | +rpath_def = $(shell if test "$(toolexeclibdir)" != /usr/lib; then echo -rpath $(toolexeclibdir); fi) |
| 8 | + |
| 9 | ## |
| 10 | ## How to build libgcj.a and libgcj.jar |
| 11 | ## |
| 12 | @@ -410,7 +412,7 @@ EXTRA_jv_convert_SOURCES = $(convert_sou |
| 13 | ## need this because we are explicitly using libtool to link using the |
| 14 | ## `.la' file. |
| 15 | jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ |
| 16 | - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) |
| 17 | + $(rpath_def) -shared-libgcc $(THREADLDFLAGS) |
| 18 | jv_convert_LINK = $(GCJLINK) |
| 19 | ## We don't explicitly link in the libraries we need; libgcj.la brings |
| 20 | ## in all dependencies. We need the -L so that gcj can find libgcj |
| 21 | @@ -429,7 +431,7 @@ gij_SOURCES = gij.cc |
| 22 | ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We |
| 23 | ## need this because we are explicitly using libtool to link using the |
| 24 | ## `.la' file. |
| 25 | -gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) |
| 26 | +gij_LDFLAGS = $(rpath_def) -shared-libgcc $(THREADLDFLAGS) |
| 27 | gij_LINK = $(GCJLINK) |
| 28 | ## See jv_convert_LDADD. |
| 29 | gij_LDADD = -L$(here)/.libs libgcj.la |
| 30 | @@ -441,7 +443,7 @@ rmic_SOURCES = |
| 31 | ## This is a dummy definition. |
| 32 | EXTRA_rmic_SOURCES = $(rmi_java_source_files) |
| 33 | rmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \ |
| 34 | - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) |
| 35 | + $(rpath_def) -shared-libgcc $(THREADLDFLAGS) |
| 36 | rmic_LINK = $(GCJLINK) |
| 37 | ## See jv_convert_LDADD. |
| 38 | rmic_LDADD = -L$(here)/.libs libgcj.la |
| 39 | @@ -453,7 +455,7 @@ rmiregistry_SOURCES = |
| 40 | ## This is a dummy definition. |
| 41 | EXTRA_rmiregistry_SOURCES = $(rmi_java_source_files) |
| 42 | rmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \ |
| 43 | - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) |
| 44 | + $(rpath_def) -shared-libgcc $(THREADLDFLAGS) |
| 45 | rmiregistry_LINK = $(GCJLINK) |
| 46 | ## See jv_convert_LDADD. |
| 47 | rmiregistry_LDADD = -L$(here)/.libs libgcj.la |
| 48 | --- libjava/Makefile.in.jj Tue Jun 4 23:25:56 2002 |
| 49 | +++ libjava/Makefile.in Wed Jun 5 15:21:59 2002 |
| 50 | @@ -184,6 +184,7 @@ INCLUDES = -I$(top_srcdir) -Iinclude -I$ |
| 51 | $(GCINCS) $(THREADINCS) $(INCLTDL) \ |
| 52 | $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS) |
| 53 | |
| 54 | +rpath_def = $(shell if test "$(toolexeclibdir)" != /usr/lib; then echo -rpath $(toolexeclibdir); fi) |
| 55 | |
| 56 | nat_files = $(nat_source_files:.cc=.lo) |
| 57 | x_nat_files = $(x_nat_source_files:.cc=.lo) |
| 58 | @@ -263,7 +264,7 @@ CONVERT_DIR = gnu/gcj/convert |
| 59 | jv_convert_SOURCES = |
| 60 | EXTRA_jv_convert_SOURCES = $(convert_source_files) |
| 61 | jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ |
| 62 | - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) |
| 63 | + $(rpath_def) -shared-libgcc $(THREADLDFLAGS) |
| 64 | |
| 65 | jv_convert_LINK = $(GCJLINK) |
| 66 | jv_convert_LDADD = -L$(here)/.libs libgcj.la |
| 67 | @@ -272,7 +273,7 @@ jv_convert_DEPENDENCIES = $(convert_sour |
| 68 | |
| 69 | |
| 70 | gij_SOURCES = gij.cc |
| 71 | -gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) |
| 72 | +gij_LDFLAGS = $(rpath_def) -shared-libgcc $(THREADLDFLAGS) |
| 73 | gij_LINK = $(GCJLINK) |
| 74 | gij_LDADD = -L$(here)/.libs libgcj.la |
| 75 | gij_DEPENDENCIES = libgcj.la libgcj.spec |
| 76 | @@ -280,7 +281,7 @@ gij_DEPENDENCIES = libgcj.la libgcj.spec |
| 77 | rmic_SOURCES = |
| 78 | EXTRA_rmic_SOURCES = $(rmi_java_source_files) |
| 79 | rmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \ |
| 80 | - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) |
| 81 | + $(rpath_def) -shared-libgcc $(THREADLDFLAGS) |
| 82 | |
| 83 | rmic_LINK = $(GCJLINK) |
| 84 | rmic_LDADD = -L$(here)/.libs libgcj.la |
| 85 | @@ -289,7 +290,7 @@ rmic_DEPENDENCIES = libgcj.la libgcj.spe |
| 86 | rmiregistry_SOURCES = |
| 87 | EXTRA_rmiregistry_SOURCES = $(rmi_java_source_files) |
| 88 | rmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \ |
| 89 | - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) |
| 90 | + $(rpath_def) -shared-libgcc $(THREADLDFLAGS) |
| 91 | |
| 92 | rmiregistry_LINK = $(GCJLINK) |
| 93 | rmiregistry_LDADD = -L$(here)/.libs libgcj.la |
projects / packages / gcc.git / blame