On Tue, 3 Jun 2025 14:56:32 GMT, Magnus Ihse Bursie <i...@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`. Marked as reviewed by erikj (Reviewer). make/Init.gmk line 121: > 119: $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \ > 120: UPDATE_MODULE_DEPS=true NO_RECIPES=true \ > 121: create-main-targets-include ) That looks like a bit of extra indentation. ------------- PR Review: https://git.openjdk.org/jdk/pull/25618#pullrequestreview-2893553379 PR Review Comment: https://git.openjdk.org/jdk/pull/25618#discussion_r2124559367
