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

8313661: [REDO] Relax prerequisites for java.base-jmod target #15279

Closed
wants to merge 1 commit into from
+6 −2
Closed

8313661: [REDO] Relax prerequisites for java.base-jmod target #15279

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
8 changes: 6 additions & 2 deletions make/Main.gmk
View file
Original file line number Diff line number Diff line change
@@ -967,11 +967,15 @@ else
jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS)

# Declare dependencies between jmod targets.
# java.base jmod needs jrt-fs.jar and access to the other jmods to be built.
# java.base jmod needs jrt-fs.jar and access to the jmods for all non
# upgradeable modules and their transitive dependencies.
# When creating the BUILDJDK, we don't need to add hashes to java.base, thus
# we don't need to depend on all other jmods
ifneq ($(CREATING_BUILDJDK), true)
java.base-jmod: jrtfs-jar $(filter-out java.base-jmod, $(JMOD_TARGETS))
java.base-jmod: jrtfs-jar $(addsuffix -jmod, $(filter-out java.base, $(sort \
$(foreach m, $(filter-out $(call FindAllUpgradeableModules), $(JMOD_MODULES)), \
$m $(call FindTransitiveDepsForModules, $m) \
))))
endif

# If not already set, set the JVM target so that the JVM will be built.