Skip to content

Commit

Permalink
Remove redundant export of PATH on Windows
Browse files Browse the repository at this point in the history
See:
* 8257679: Improved unix compatibility layer in Windows build (winenv)

Signed-off-by: Keith W. Campbell <[email protected]>
  • Loading branch information
keithc-ca committed Sep 30, 2024
1 parent 4a31179 commit cd5a597
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions closed/OpenJ9.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cd5a597

Please sign in to comment.