archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 02:24:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8277370: configure script cannot distinguish WSL version

Browse source 
Reviewed-by: erikj
This commit is contained in:
Yasumasa Suenaga 2021-11-19 20:24:17 +00:00
parent a3406a1d8a
commit 2d4af2255f
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
make/autoconf/basic_windows.m4
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -34,9 +34,10 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
OPENJDK_BUILD_OS_ENV=windows.wsl1 OPENJDK_BUILD_OS_ENV=windows.wsl1
else else
# This test is not guaranteed, but there is no documented way of # This test is not guaranteed, but there is no documented way of
# distinguishing between WSL1 and WSL2. Assume only WSL2 has WSL_INTEROP # distinguishing between WSL1 and WSL2.
# in /run/WSL # Check whether "Hyper-V" appears in /proc/interrupts because WSL2 runs on Hyper-V.
if test -d "/run/WSL" ; then $GREP -q Hyper-V /proc/interrupts
if test $? -eq 0; then
OPENJDK_BUILD_OS_ENV=windows.wsl2 OPENJDK_BUILD_OS_ENV=windows.wsl2
else else
OPENJDK_BUILD_OS_ENV=windows.wsl1 OPENJDK_BUILD_OS_ENV=windows.wsl1