Use $(PHASE_MAKEDIRS) for the Java phase for consistency #270
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The pre-hook and post-hook in CompileJavaModules.gmk were removed by * 8258407 Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk and the include directive for Java.gmk uses an absolute path leaving no path to customizations. This updates Main.gmk to define an include path based on PHASE_MAKEDIRS for make as was done for other phases in * 8252998 ModuleWrapper.gmk doesn't consult include path Signed-off-by: Keith W. Campbell <[email protected]>
|
Note that I've asked @adamfarley to propose this change upstream. |
|
jenkins compile win,osx,zlinux jdknext |
|
Upstream material all set: Bug: https://bugs.openjdk.java.net/browse/JDK-8259942 |
pshipton
approved these changes
Jan 18, 2021
|
@keithc-ca - FYI: this change was just merged upstream. |
|
Thanks, @adamfarley; I noticed it while reviewing #290. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The pre-hook and post-hook in
CompileJavaModules.gmkwere removed byand the include directive for
Java.gmkuses an absolute path leaving no path to customizations. This updatesMain.gmkto define an include path based onPHASE_MAKEDIRSfor make as was done for other phases inThis is required by part of the anticipated fix for eclipse-openj9/openj9#11464.