changeset 4577:fc1b759e9c5a tip

Remove some overlooked bootstrap workarounds
author hamish
date Tue, 21 Jan 2014 19:45:32 +0000
parents 68767a61582d
children
files make/com/sun/jmx/Makefile make/common/Demo.gmk make/common/shared/Compiler-gcc.gmk make/common/shared/Defs-java.gmk make/java/nio/Makefile
diffstat 5 files changed, 9 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/make/com/sun/jmx/Makefile	Tue Jan 21 19:43:09 2014 +0000
+++ b/make/com/sun/jmx/Makefile	Tue Jan 21 19:45:32 2014 +0000
@@ -114,12 +114,11 @@
                 -d $(CLASSDESTDIR)              \
                 -iiop -v1.2                     \
                 $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
-# Bootstrap rmic cannot do this -- wont cause problem with OpenJDK's ORB
-#	$(RMIC) $(HOTSPOT_INTERPRETER_FLAG) -classpath "$(CLASSDESTDIR)"    \
-#                -d $(CLASSDESTDIR)              \
-#                -iiop -v1.2                     \
-#                -standardPackage                \
-#                $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
+	$(RMIC) $(HOTSPOT_INTERPRETER_FLAG) -classpath "$(CLASSDESTDIR)"    \
+                -d $(CLASSDESTDIR)              \
+                -iiop -v1.2                     \
+                -standardPackage                \
+                $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
 	@$(java-vm-cleanup)
 
 stubs: $(FILES_stubs) 
--- a/make/common/Demo.gmk	Tue Jan 21 19:43:09 2014 +0000
+++ b/make/common/Demo.gmk	Tue Jan 21 19:45:32 2014 +0000
@@ -257,7 +257,7 @@
     $(DEMO_RESOURCES:%=$(DEMO_JAR_IMAGE)/%)
 	@$(prep-target)
 	$(MKDIR) -p $(DEMO_JAR_IMAGE)
-	$(JAVAC_CMD) -d $(DEMO_JAR_IMAGE) -bootclasspath "$(ABS_OUTPUTDIR)/classes:$(ICEDTEA_RT)" -sourcepath $(DEMO_BUILD_SRCDIR) \
+	$(JAVAC_CMD) -d $(DEMO_JAR_IMAGE) -sourcepath $(DEMO_BUILD_SRCDIR) \
 	    @$(DEMO_JAVAC_INPUT)
   ifeq ($(DEMO_INCL_SRC),true)
 	$(CP) $(DEMO_JAVA_SOURCES:%=$(DEMO_BUILD_SRCDIR)/%) $(DEMO_JAR_IMAGE)
--- a/make/common/shared/Compiler-gcc.gmk	Tue Jan 21 19:43:09 2014 +0000
+++ b/make/common/shared/Compiler-gcc.gmk	Tue Jan 21 19:45:32 2014 +0000
@@ -92,7 +92,7 @@
   CXX            = $(COMPILER_PATH)g++
 
   # Option used to create a shared library
-  SHARED_LIBRARY_FLAG = -shared # HAIKU_NOTE check me out
+  SHARED_LIBRARY_FLAG = -shared
 
 endif
 
--- a/make/common/shared/Defs-java.gmk	Tue Jan 21 19:43:09 2014 +0000
+++ b/make/common/shared/Defs-java.gmk	Tue Jan 21 19:45:32 2014 +0000
@@ -66,8 +66,7 @@
    -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
 
 # JVM options
-JAVA_JVM_FLAGS = 
-#$(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
+JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
 
 ifeq ($(ADD_CLIENT_VM_OPTION), true)
   JAVA_JVM_FLAGS += -client
--- a/make/java/nio/Makefile	Tue Jan 21 19:43:09 2014 +0000
+++ b/make/java/nio/Makefile	Tue Jan 21 19:45:32 2014 +0000
@@ -31,8 +31,7 @@
 PACKAGE = java.nio
 LIBRARY = nio
 PRODUCT = java
-#OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
-OTHER_JAVACFLAGS += -Xlint:serial -Werror
+OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
 include $(BUILDDIR)/common/Defs.gmk
 
 NIO_SRC = $(SHARE_SRC)/classes/java/nio