Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove redundant export of PATH on Windows #47

Merged
merged 1 commit into from
Sep 30, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions closed/OpenJ9.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,15 @@ 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
# set up Visual Studio environment
# - wrap LIB in single-quotes to hide backslashes from make
# - wrap PATH in double-quotes as it may contain spaces (unix path)
EXPORT_COMPILER_ENV_VARS := LIB='$(OPENJ9_VS_LIB)' PATH="$(PATH)"
EXPORT_COMPILER_ENV_VARS := LIB='$(OPENJ9_VS_LIB)'
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