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.

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

Add dependency in Main.mk to support the generation of jvmti.h #116

Merged
merged 1 commit into from
Mar 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions closed/make/Main.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ OPENSSL_MAKE := $(MAKE) -f $(TOPDIR)/closed/openssl.gmk SPEC=$(SPEC)
openssl-build : buildtools-langtools
+$(OPENSSL_MAKE)

java.base-copy : openssl-build
java.base-copy : j9vm-build

java.base-libs : java.base-copy j9vm-build
java.base-libs : java.base-copy

j9vm-build : openssl-build
+$(OPENJ9_MAKE) openj9_build_jdk
Expand Down
2 changes: 1 addition & 1 deletion closed/make/copy/Copy-java.base.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ TARGETS += \
$(INCLUDE_TARGET_DIR)/ibmjvmti.h \
#

$(INCLUDE_TARGET_DIR)/jvmti.h : $(TOPDIR)/openj9/runtime/include/jvmti.h
$(INCLUDE_TARGET_DIR)/jvmti.h : $(OUTPUTDIR)/vm/include/jvmti.h
$(call install-file)

$(INCLUDE_TARGET_DIR)/ibmjvmti.h : $(TOPDIR)/openj9/runtime/include/ibmjvmti.h
Expand Down