equal
deleted
inserted
replaced
120 # Save the original path before replacing it with the Visual Studio tools |
120 # Save the original path before replacing it with the Visual Studio tools |
121 ORIGINAL_PATH:=@ORIGINAL_PATH@ |
121 ORIGINAL_PATH:=@ORIGINAL_PATH@ |
122 ifeq ($(OPENJDK_TARGET_OS), windows) |
122 ifeq ($(OPENJDK_TARGET_OS), windows) |
123 # On Windows, the Visual Studio toolchain needs the PATH to be adjusted |
123 # On Windows, the Visual Studio toolchain needs the PATH to be adjusted |
124 # to include Visual Studio tools (this needs to be in cygwin/msys style). |
124 # to include Visual Studio tools (this needs to be in cygwin/msys style). |
125 export PATH:=@VS_PATH@ |
125 ifeq ($(OPENJDK_TARGET_OS_ENV), windows.wsl) |
|
126 export FIXPATH_PATH:=@VS_PATH_WINDOWS@ |
|
127 export WSLENV:=$(WSLENV):FIXPATH_PATH:DEBUG_FIXPATH |
|
128 else |
|
129 export PATH:=@VS_PATH@ |
|
130 endif |
126 endif |
131 endif |
127 |
132 |
128 SYSROOT_CFLAGS := @SYSROOT_CFLAGS@ |
133 SYSROOT_CFLAGS := @SYSROOT_CFLAGS@ |
129 SYSROOT_LDFLAGS := @SYSROOT_LDFLAGS@ |
134 SYSROOT_LDFLAGS := @SYSROOT_LDFLAGS@ |
130 |
135 |