From 1f577886584a329a05106e5a74c273eb680cb817 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 1 May 2000 23:36:39 +0200 Subject: [PATCH] Makefile.am (GCJCOMPILE, [...]): Move -L option out of FLAGS. 2000-04-28 Jakub Jelinek * Makefile.am (GCJCOMPILE, JCFLAGS, JF1CLAGS, jv_convert_LINK, gij_LINK, libgcj.zip, .java=.class): Move -L option out of FLAGS. (libgcj_la_LDFLAGS): Add -L../libstdc++ for in-gcc builds. (jv_convert_LDFLAGS, gij_LDFLAGS): Add `pwd`/../libstdc++ to -rpath for in-gcc builds. * Makefile.in: Rebuilt. From-SVN: r33587 --- libjava/ChangeLog | 9 +++++++++ libjava/Makefile.am | 20 ++++++++++---------- libjava/Makefile.in | 20 ++++++++++---------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 66797ed483a..3035ddabb8d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2000-04-28 Jakub Jelinek + + * Makefile.am (GCJCOMPILE, JCFLAGS, JF1CLAGS, jv_convert_LINK, + gij_LINK, libgcj.zip, .java=.class): Move -L option out of FLAGS. + (libgcj_la_LDFLAGS): Add -L../libstdc++ for in-gcc builds. + (jv_convert_LDFLAGS, gij_LDFLAGS): Add `pwd`/../libstdc++ to + -rpath for in-gcc builds. + * Makefile.in: Rebuilt. + 2000-04-28 Tom Tromey * libgcj.spec.in (*jc1): Added -fasynchronous-exceptions. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 7bbaede976c..25bab2d747c 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -71,7 +71,7 @@ GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT) ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT) endif # CANADIAN -GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled $(JC1FLAGS) -c +GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c JAVAC = $(GCJ) -C @@ -91,8 +91,8 @@ else AM_CFLAGS = @LIBGCJ_CFLAGS@ endif -JCFLAGS = -g -L$(here) -JC1FLAGS = -g -L$(here) @LIBGCJ_JAVAFLAGS@ +JCFLAGS = -g +JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@ LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include @@ -128,7 +128,7 @@ libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \ $(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL) libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \ $(THREADOBJS) $(libffi_files) $(LIBLTDL) -libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \ +libgcj_la_LDFLAGS = -L../libstdc++ -rpath $(toolexeclibdir) \ ## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` @@ -154,7 +154,7 @@ $(built_java_source_files:.java=.class): $(built_java_source_files) ## This little nastiness is here so that the backquoted stuff in the ## GCJ definition can be correctly expanded, if required. javac="$(JAVAC)"; \ - $$javac $(JCFLAGS) -classpath $(here):`cd $(srcdir) && /bin/pwd` \ + $$javac -L$(here) $(JCFLAGS) -classpath $(here):`cd $(srcdir) && /bin/pwd` \ -d $(here) $? ## We have the zip file depend on the java sources and not the class @@ -170,7 +170,7 @@ libgcj.zip: $(java_source_files) $(cond_awt_java_source_files) ## This little nastiness is here so that the backquoted stuff in the ## GCJ definition can be correctly expanded, if required. javac="$(JAVAC)"; cd $(srcdir); \ - $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \ + $$javac -L$(here) $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \ $(subst $(srcdir)/,,$?) -@rm -f libgcj.zip ## Note that we explicitly want to include directory information. @@ -361,8 +361,8 @@ EXTRA_jv_convert_SOURCES = $(convert_source_files) ## need this because we are explicitly using libtool to link using the ## `.la' file. jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ - -rpath $(toolexeclibdir) -jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \ + -rpath `if test -d ../libstdc++; then cd ../libstdc++; pwd; fi` -rpath $(toolexeclibdir) +jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) \ -o jv-convert ## We explicitly link in the libraries we need. This way we don't ## need -nodefaultlibs, so we can still rely on gcj picking up the @@ -380,8 +380,8 @@ gij_SOURCES = gij.cc ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We ## need this because we are explicitly using libtool to link using the ## `.la' file. -gij_LDFLAGS = -rpath $(toolexeclibdir) -gij_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \ +gij_LDFLAGS = -rpath `if test -d ../libstdc++; then cd ../libstdc++; pwd; fi` -rpath $(toolexeclibdir) +gij_LINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) \ -o gij ## We explicitly link in the libraries we need. This way we don't ## need -nodefaultlibs, so we can still rely on gcj picking up the diff --git a/libjava/Makefile.in b/libjava/Makefile.in index c1d269dd4aa..d5d05daa2dc 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -157,7 +157,7 @@ data_DATA = libgcj.zip @CANADIAN_FALSE@expanded = \ @CANADIAN_FALSE@`cd $(MULTIBUILDTOP)../$(COMPPATH)/gcc && pwd` -GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled $(JC1FLAGS) -c +GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c JAVAC = $(GCJ) -C @@ -172,8 +172,8 @@ AM_CXXFLAGS = -fno-rtti -fvtable-thunks -fasynchronous-exceptions \ @USING_GCC_FALSE@AM_CFLAGS = \ @USING_GCC_FALSE@@LIBGCJ_CFLAGS@ -JCFLAGS = -g -L$(here) -JC1FLAGS = -g -L$(here) @LIBGCJ_JAVAFLAGS@ +JCFLAGS = -g +JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@ LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include @@ -204,7 +204,7 @@ libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \ libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \ $(THREADOBJS) $(libffi_files) $(LIBLTDL) -libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \ +libgcj_la_LDFLAGS = -L../libstdc++ -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` @@ -240,9 +240,9 @@ CONVERT_DIR = gnu/gcj/convert jv_convert_SOURCES = EXTRA_jv_convert_SOURCES = $(convert_source_files) jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ - -rpath $(toolexeclibdir) + -rpath `if test -d ../libstdc++; then cd ../libstdc++; pwd; fi` -rpath $(toolexeclibdir) -jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \ +jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) \ -o jv-convert jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ @@ -253,8 +253,8 @@ jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ gij_SOURCES = gij.cc -gij_LDFLAGS = -rpath $(toolexeclibdir) -gij_LINK = $(LIBTOOL) --mode=link $(GCJ) $(JC1FLAGS) $(LDFLAGS) \ +gij_LDFLAGS = -rpath `if test -d ../libstdc++; then cd ../libstdc++; pwd; fi` -rpath $(toolexeclibdir) +gij_LINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) \ -o gij gij_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs @@ -1671,13 +1671,13 @@ $(awt_java_source_files:.java=.class): libgcj.zip $(built_java_source_files:.java=.class): $(built_java_source_files) javac="$(JAVAC)"; \ - $$javac $(JCFLAGS) -classpath $(here):`cd $(srcdir) && /bin/pwd` \ + $$javac -L$(here) $(JCFLAGS) -classpath $(here):`cd $(srcdir) && /bin/pwd` \ -d $(here) $? libgcj.zip: $(java_source_files) $(cond_awt_java_source_files) $(MAKE) $(built_java_source_files:.java=.class) javac="$(JAVAC)"; cd $(srcdir); \ - $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \ + $$javac -L$(here) $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \ $(subst $(srcdir)/,,$?) -@rm -f libgcj.zip $(ZIP) -r libgcj java gnu -n .class -i '*.class' -i '*/' -- 2.30.2