Fix assertion failure in b15
Andrew Haley
aph at redhat.com
Wed Jul 11 10:47:35 PDT 2007
A small change to one of our "make it build with gcj" patches. We
were using
$(ICEDTEA_BUILD_DIR)/tmp/java/java.lang/java/CClassHeaders
instead of
$(CLASSHDRDIR)
This was wrong in the case of a debug build.
Andrew.
--- openjdk/j2se/make/common/Rules.gmk~ 2007-07-10 17:22:17.000000000 +0100
+++ openjdk/j2se/make/common/Rules.gmk 2007-07-11 16:12:26.000000000 +0100
@@ -291,8 +291,8 @@
-d $(CLASSHDRDIR)/ \
$(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
@$(java-vm-cleanup)
- -mv $(ICEDTEA_BUILD_DIR)/tmp/java/java.lang/java/CClassHeaders/java_lang_ClassLoader\$$NativeLibrary.h \
- $(ICEDTEA_BUILD_DIR)/tmp/java/java.lang/java/CClassHeaders/java_lang_ClassLoader_NativeLibrary.h
+ -mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \
+ $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h
@$(TOUCH) $@
--
Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK
Registered in England and Wales No. 3798903
More information about the distro-pkg-dev
mailing list