Integrated: 8289735: UTIL_LOOKUP_PROGS fails on pathes with space

Christoph Langer clanger at openjdk.org
Tue Apr 25 14:24:22 UTC 2023


On Mon, 24 Apr 2023 20:11:50 GMT, Christoph Langer <clanger at openjdk.org> wrote:

> This is an attempt to fix the issue on Windows when no cygwin Git is installed or the Git for Windows installation has precedence in PATH lookup. The path to the Windows GIT installation usually resides in `C:\Program Files` which contains a space and thus needs some special handling.
> 
> There exists code in `UTIL_LOOKUP_PROGS`/`UTIL_FIXUP_EXECUTABLE` that would handle this. However, it relies on initializations made in `PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET` and `BASIC_SETUP_PATHS`. Currently, `UTIL_LOOKUP_PROGS(GIT, git)` is called too early in configure and hence the problematic Windows path is not handled correctly. My fix makes sure that only the barely necessary tool lookups required for `PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET` and `BASIC_SETUP_PATHS` are made in `BASIC_SETUP_FUNDAMENTAL_TOOLS` and everything else is moved into another macro called `BASIC_SETUP_TOOLS` that is invoked after path handling is set up correctly, which includes the lookup of git.

This pull request has now been integrated.

Changeset: bad6aa68
Author:    Christoph Langer <clanger at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/bad6aa68e4d491e819ab22e91dd5d65bb094120e
Stats:     37 lines in 4 files changed: 23 ins; 8 del; 6 mod

8289735: UTIL_LOOKUP_PROGS fails on pathes with space

Reviewed-by: erikj, mbaesken

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

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



More information about the build-dev mailing list