--- a/make/Main.gmk Mon Oct 12 11:49:29 2015 +0200
+++ b/make/Main.gmk Mon Oct 19 13:21:27 2015 -0400
@@ -93,7 +93,10 @@
unpack-sec:
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UnpackSecurity.gmk)
-ALL_TARGETS += import-hotspot unpack-sec
+generate-exported-symbols:
+ +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildStatic.gmk)
+
+ALL_TARGETS += import-hotspot unpack-sec generate-exported-symbols
################################################################################
# Gensrc targets, generating source before java compilation can be done
@@ -364,10 +367,16 @@
import-hotspot: hotspot
+ generate-exported-symbols: java.base-libs jdk.jdwp.agent-libs
+
$(LIBS_TARGETS): import-hotspot
$(LAUNCHER_TARGETS): java.base-libs
+ ifeq ($(STATIC_BUILD), true)
+ $(LAUNCHER_TARGETS): generate-exported-symbols
+ endif
+
# The demos are currently linking to libjvm and libjava, just like all other
# jdk libs, even though they don't need to. To avoid warnings, make sure they
# aren't built until after libjava and libjvm are available to link to.