[jdk11u-dev] RFR: 8218431: Improved platform checking in makefiles

[Matthias Baesken]

On Tue, 31 Jan 2023 08:50:13 GMT, Goetz Lindenmaier <goetz at openjdk.org> wrote:

> This is a quite big change, but it's all  mechanic edits.
> It replaces the tests for platforms. The old tests
> still work, so there is no problem in omitting some 
> of the adaptions.
> The new functionality added in Utels.gmk applied clean.
> 
> I resolved the following hunks:make/Images.gmk
> make/RunTests.gmk
> Simple resolve
> 
> make/TestImage.gmk
> Skipped, edited code not in 11.
> 
> make/common/NativeCompilation.gmk
> Two hunks did not apply.
> Skipped first one, code not in 11.
> Second was trivial.
> 
> make/copy/Copy-java.base.gmk
> First trivial.
> Second skipped. Two conditions checked magically :)
> Third skipped.
> 
> make/hotspot/gensrc/GensrcAdlc.gmk
> Trivial.
> 
> make/hotspot/ide/CreateVSProject.gmk
> Skipped, code not in 11.
> 
> make/hotspot/lib/CompileDtraceLibraries.gmk
> Trivial
> 
> make/hotspot/lib/CompileJvm.gmk
> Trivial.
> 
> make/launcher/LauncherCommon.gmk
> Omitted. Code not in 11.
> 
> make/lib/Awt2dLibraries.gmk
> Parts applied, parts of the patched code not in 11.
> Second and third hung to resolve were trivial.
> 
> make/lib/CoreLibraries.gmk
> Trival.
> 
> make/lib/Lib-java.base.gmk
> Code not in 11.
> 
> make/lib/Lib-jdk.hotspot.agent.gmk
> Trivial
> 
> make/test/JtregNativeJdk.gmk
> Trivial

Could you please check make/common/NativeCompilation.gmk , around line 986 ? Seems this one was moved and missed in the patch


        # Generate debuginfo files.
        ifeq ($(OPENJDK_TARGET_OS), windows)

-------------

PR: https://git.openjdk.org/jdk11u-dev/pull/1702