A minor problem arises when we eliminate the last cmd from the ios build.
When making images the support/modules_cmds-stripped is passed to the
jimage tool, but the directory is not created if no cmds were processed.
This will be a moot issue once the jigsaw integration is complete. In
the interim,
here is a workaround I'd like to add that gets past the problem.
diff --git a/make/Images.gmk b/make/Images.gmk
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -121,6 +121,7 @@
$(call DependOnVariable, JDK_MODULES_LIST)
$(ECHO) Creating jdk jimage
$(RM) -r $(JDK_IMAGE_DIR) $(JDK_SORTED_MODULES)
+ $(call MakeDir, $(MODULES_CMDS))
$(JIMAGE_TOOL) --mods $(JDK_MODULES_LIST) --output $(JDK_IMAGE_DIR) \
$(MODULES_XML) > $(JDK_SORTED_MODULES)
$(TOUCH) $@
@@ -129,6 +130,7 @@
$(call DependOnVariable, JRE_MODULES_LIST)
$(ECHO) Creating jre jimage
$(RM) -r $(JRE_IMAGE_DIR) $(JRE_SORTED_MODULES)
+ $(call MakeDir, $(MODULES_CMDS))
$(JIMAGE_TOOL) --mods $(JRE_MODULES_LIST) --output $(JRE_IMAGE_DIR) \
$(MODULES_XML) > $(JRE_SORTED_MODULES)
$(TOUCH) $@
On 03/10/16 12:12, Erik Joelsson wrote:
Looks ok for now.
/Erik
On 2016-03-10 17:43, Gary Adams wrote:
Here are two quick fixes for ios build issues after the b106 merge
A quick workaround for the ios build issue with upack executable is
to noop
the launcher makefile, similar to what has been done for other
launcher makefiles.
A longer term solution will be added later with a proper configure
flag to disable
building command line launchers.
The ios-arm64 (aka aarch64 zero vm) needs template files for
UnixConstants
and SocketOptionRegistry. It was using the ios-arm templates. Rather
than
complicate the makefiles the ios-arm files have been cloned.
Webrev: http://cr.openjdk.java.net/~gadams/8151631/webrev.00/
JIRA:
https://bugs.openjdk.java.net/browse/JDK-8151630?filter=-1
https://bugs.openjdk.java.net/browse/JDK-8151631?filter=-1
