Integrated: 8358515: make cmp-baseline is broken after JDK-8349665

Tue Jun 3 19:28:24 UTC 2025

On Tue, 3 Jun 2025 14:56:32 GMT, Magnus Ihse Bursie <ihse at openjdk.org> wrote:

> The fix in to [JDK-8357991](https://bugs.openjdk.org/browse/JDK-8357991) was not enough to solve all problems that had been introduced with JDK-8349665. Also builds run using `COMPARE_BUILD` was affected.
> 
> The core of the problem was that there were multiple additional ways to run what esstentially amount to `make -f Init.gmk main`, in places that I did not find before. So I took a step back and chose a safer approach: now the `main` target in `Init.gmk` depends on an additional target, that will always make sure that the necessary helper files are present. This means the specific patch for bootcycle builds in JDK-8357991 could be reverted. This solution is also future-proof if we should figure out any new creative ways of calling `main` in `Init.gmk`.

This pull request has now been integrated.

Changeset: a44a4700
Author:    Magnus Ihse Bursie <ihse at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/a44a470052aff3b17fa53165f043ccce36c1ef9b
Stats:     29 lines in 3 files changed: 12 ins; 13 del; 4 mod

8358515: make cmp-baseline is broken after JDK-8349665

Reviewed-by: erikj

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

PR: https://git.openjdk.org/jdk/pull/25618