Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move ddrgen step after building vm #24

Merged
merged 1 commit into from
Aug 16, 2018
Merged

Move ddrgen step after building vm #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions closed/OpenJ9.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,22 @@ OPENJ9_NOTICE_FILE := openj9/longabout.html
OPENJ9_NOTICE_FILE_RENAME := openj9-notices.html
OPENJ9_REDIRECTOR := redirector/$(LIBRARY_PREFIX)jvm_jdk12$(SHARED_LIBRARY_SUFFIX)

OPENJ9_DDR_FILES :=

ifeq (true,$(OPENJ9_ENABLE_DDR))
.PHONY : run-ddrgen
$(OUTPUTDIR)/vm/j9ddr.dat : run-ddrgen
run-ddrgen :
export OPENJDK_VERSION_NUMBER_FOUR_POSITIONS=$(VERSION_NUMBER_FOUR_POSITIONS) \
VERSION_MAJOR=$(VERSION_FEATURE) \
$(EXPORT_MSVS_ENV_VARS) \
&& $(MAKE) -C $(OUTPUTDIR)/vm/ddr -f run_omrddrgen.mk \
CC="$(CC)" \
CXX="$(CXX)"

OPENJ9_DDR_FILES += j9ddr.dat
endif

MODULES_LIBS_DIR := $(OUTPUTDIR)/support/modules_libs

# openjdk makeflags don't work with openj9/omr native compiles; override with number of CPUs which openj9 and omr need supplied
Expand Down Expand Up @@ -181,6 +197,9 @@ $(foreach file,$(OPENJ9_SHARED_CLASSES_LIBRARIES), \
$(foreach file,$(OPENJ9_MANAGEMENT_LIBRARIES), \
$(eval $(call openj9_copy_prereq,$1,$(MODULES_LIBS_DIR)/java.management/$(OPENJ9_LIBS_SUBDIR)/$(file),$(OUTPUTDIR)/vm/$(file))))

$(foreach file,$(OPENJ9_DDR_FILES), \
$(eval $(call openj9_copy_prereq,$1,$(MODULES_LIBS_DIR)/java.base/$(OPENJ9_LIBS_SUBDIR)/$(file),$(OUTPUTDIR)/vm/$(file))))

endef

# openj9_copy_prereq
Expand Down Expand Up @@ -383,12 +402,6 @@ ifeq (windows,$(OPENJDK_TARGET_OS))
@$(CP) -p $(OUTPUTDIR)/vm/j9vm_jdk12/$(LIBRARY_PREFIX)jdk12_jvm$(STATIC_LIBRARY_SUFFIX) $(OUTPUTDIR)/vm/lib/jvm$(STATIC_LIBRARY_SUFFIX)
endif

ifeq (true,$(OPENJ9_ENABLE_DDR))
@$(ECHO) Copying j9ddr.dat
@$(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

J9JCL_SOURCES_DONEFILE := $(MAKESUPPORT_OUTPUTDIR)/j9jcl_sources.done

recur_wildcard = $(foreach dir,$(wildcard $1/*),$(call recur_wildcard,$(dir),$2) $(filter $(subst *,%,$2),$(dir)))
Expand Down