Move ddrgen step after building vm

Move the run ddrgen step outside of the building VM step in order to resolve DDR dependencies better. Signed-off-by: mikezhang <[email protected]>
ibmruntimes · Aug 13, 2018 · d9c6264 · d9c6264
1 parent ba69314
commit d9c6264
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
@@ -384,7 +384,9 @@ ifeq (windows,$(OPENJDK_TARGET_OS))
 endif
 
 ifeq (true,$(OPENJ9_ENABLE_DDR))
-	@$(ECHO) Copying j9ddr.dat
+	@$(ECHO) Running ddrgen to create j9ddr.dat, then copying it to lib directory
+	$(MAKE) -C $(OUTPUT_ROOT)/vm/ddr -f run_omrddrgen.mk VERSION_MAJOR=10 OPENJDK_VERSION_NUMBER_FOUR_POSITIONS=$(VERSION_NUMBER_FOUR_POSITIONS) \
+		CC="$(CC)" CXX="$(CXX)" $(EXPORT_MSVS_ENV_VARS)
 	@$(MKDIR) -p $(MODULES_LIBS_DIR)/java.base/$(OPENJ9_LIBS_SUBDIR)
 	@$(CP) -p $(OUTPUTDIR)/vm/j9ddr.dat $(MODULES_LIBS_DIR)/java.base/$(OPENJ9_LIBS_SUBDIR)/
 endif