This is the mail archive of the java-patches@sources.redhat.com mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Patch: fix for build bug


I'm checking this in.  It changes the libgcj Makefile so that an error
building the .class files will cause the build to stop immediately.
If `make -k' is used, the makefile will instead try to build all the
.class files and will then fail.

2000-11-14  Tom Tromey  <tromey@cygnus.com>

	* Makefile.in: Rebuilt.
	* Makefile.am (libgcj.zip): Fail immediately if compilation fails
	and -k not given.

Tom

Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.101
diff -u -r1.101 Makefile.am
--- Makefile.am	2000/11/03 03:58:05	1.101
+++ Makefile.am	2000/11/14 18:57:29
@@ -194,11 +194,14 @@
 	$(MAKE) $(built_java_source_files:.java=.class)
 ## This little nastiness is here so that the backquoted stuff in the
 ## GCJ definition can be correctly expanded, if required.
-	@javac="$(JAVAC)"; dir=`/bin/pwd`; cd $(srcdir); \
-	  for f in `cat $$dir/tmp-list`; do \
-	    echo $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) $$f; \
-	    $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) $$f; \
-	done
+	@set fnord $(MAKEFLAGS); amf=$$2; fail=no; \
+	javac="$(JAVAC)"; dir=`/bin/pwd`; cd $(srcdir); \
+	for f in `cat $$dir/tmp-list`; do \
+	  echo $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) $$f; \
+	  $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) $$f \
+	    || case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \
+	done; \
+	test "$$fail" = no
 	-@rm -f tmp-list libgcj.zip
 ## Note that we explicitly want to include directory information.
 	find java gnu -type d -o -type f -name '*.class' | \

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]