29 include $(SPEC) |
29 include $(SPEC) |
30 include MakeBase.gmk |
30 include MakeBase.gmk |
31 include JavaCompilation.gmk |
31 include JavaCompilation.gmk |
32 include SetupJavaCompilers.gmk |
32 include SetupJavaCompilers.gmk |
33 |
33 |
34 ifeq ($(OPENJDK_TARGET_OS), windows) |
34 ifeq ($(call isTargetOs, windows), true) |
35 # The next part is a bit hacky. We include the CompileJvm.gmk to be |
35 # The next part is a bit hacky. We include the CompileJvm.gmk to be |
36 # able to extact flags, but we do not wish to execute the rules. |
36 # able to extact flags, but we do not wish to execute the rules. |
37 |
37 |
38 # Use client as base for defines and includes |
38 # Use client as base for defines and includes |
39 JVM_VARIANT=client |
39 JVM_VARIANT=client |
44 # Reset targets so we don't build libjvm. |
44 # Reset targets so we don't build libjvm. |
45 TARGETS := |
45 TARGETS := |
46 |
46 |
47 # Helper macro to convert a unix path to a Windows path, suitable for |
47 # Helper macro to convert a unix path to a Windows path, suitable for |
48 # inclusion in a command line. |
48 # inclusion in a command line. |
49 ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin) |
49 ifeq ($(call isBuildOsEnv, windows.cygwin), true) |
50 FixPath = \ |
50 FixPath = \ |
51 $(strip $(subst \,\\,$(shell $(CYGPATH) -w $1))) |
51 $(strip $(subst \,\\,$(shell $(CYGPATH) -w $1))) |
52 FixLinuxExecutable = \ |
52 FixLinuxExecutable = \ |
53 $(call FixPath, $1) |
53 $(call FixPath, $1) |
54 else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.wsl) |
54 else ifeq ($(call isBuildOsEnv, windows.wsl), true) |
55 FixPath = \ |
55 FixPath = \ |
56 $(strip $(subst \,\\,$(shell $(WSLPATH) -w $1))) |
56 $(strip $(subst \,\\,$(shell $(WSLPATH) -w $1))) |
57 FixLinuxExecutable = \ |
57 FixLinuxExecutable = \ |
58 "%windir%\Sysnative\wsl.exe $1" |
58 "%windir%\Sysnative\wsl.exe $1" |
59 endif |
59 endif |