This is an automated email from the ASF dual-hosted git repository. leginee pushed a commit to branch win10-msvc-trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 366b410a945deed8a25f832db44f83d0b7013752 Author: Peter Kovacs <[email protected]> AuthorDate: Sun Aug 23 00:21:16 2026 +0200 set_soenv: put jre/bin/server on PATH The two Windows PATH blocks add jre/bin/hotspot or jre/bin/client if either exists, and never look for server. A 64 bit HotSpot JDK ships only jre/bin/server -- there is no client VM -- so on x64 no JVM directory reached PATH at all. Same shape as the FRAME_HOME lib/x64 bug two commits back: an arch-conditional path that only ever considered the x86 layout. Nothing has failed on it yet, since the build finds java.exe in bin/ and jvmfwk resolves jvm.dll from JAVA_HOME, but anything doing a bare LoadLibrary("jvm.dll") would not. Co-Authored-By: Claude Opus 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01VrM7EMKgiuyVcCUe9nSbZR --- main/set_soenv.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/main/set_soenv.in b/main/set_soenv.in index 7bac838649..24a7647be3 100644 --- a/main/set_soenv.in +++ b/main/set_soenv.in @@ -1228,6 +1228,11 @@ elsif ($platform =~ m/cygwin/) if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."client" ) { $PATH .= $ps.CygFormat($JAVA_HOME).$ds."jre".$ds."bin".$ds."client"; } + # A 64 bit HotSpot JDK ships only jre/bin/server -- there is no client + # VM -- so without this no JVM directory reaches PATH at all on x64. + if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."server" ) { + $PATH .= $ps.CygFormat($JAVA_HOME).$ds."jre".$ds."bin".$ds."server"; + } } # Add path to compiler @@ -1391,6 +1396,11 @@ elsif ($platform =~ m/os2/) if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."client" ) { $PATH .= $ps.$JAVA_HOME.$ds."jre".$ds."bin".$ds."client"; } + # A 64 bit HotSpot JDK ships only jre/bin/server -- there is no client + # VM -- so without this no JVM directory reaches PATH at all on x64. + if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."server" ) { + $PATH .= $ps.$JAVA_HOME.$ds."jre".$ds."bin".$ds."server"; + } } if ( '@ANT_HOME@' ne '' )
