From 20e42e6909649251d53a92517e8fc8743f84813a Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Fri, 27 Sep 2024 14:10:22 -0400 Subject: [PATCH] Remove redundant export of PATH on Windows See: * 8257679: Improved unix compatibility layer in Windows build (winenv) Signed-off-by: Keith W. Campbell --- closed/OpenJ9.gmk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk index 3042116e80..22a5b982e0 100644 --- a/closed/OpenJ9.gmk +++ b/closed/OpenJ9.gmk @@ -104,15 +104,13 @@ ifeq (false,$(WARNINGS_AS_ERRORS_OPENJ9)) export UMA_SUPPRESS_WARNINGS_AS_ERRORS := 1 endif -ifeq (windows,$(OPENJDK_TARGET_OS)) +ifeq ($(call isTargetOs, windows), true) # convert windows path to unix path UnixPath = $(shell $(PATHTOOL) -u $1) - # set Visual Studio environment - # wrap PATH in quotes as it contains spaces (unix path) - EXPORT_COMPILER_ENV_VARS := PATH="$(PATH)" -else ifeq (zos,$(OPENJDK_TARGET_OS)) + EXPORT_COMPILER_ENV_VARS := +else ifeq ($(call isTargetOs, zos), true) UnixPath = $1 - # Allow options to follow the input file name + # allow options to follow the input file name EXPORT_COMPILER_ENV_VARS := _CC_CCMODE=1 _C89_CCMODE=1 _CXX_CCMODE=1 else UnixPath = $1