--- a/jdk/make/common/shared/Defs-utils.gmk Wed Jul 05 18:26:11 2017 +0200
+++ b/jdk/make/common/shared/Defs-utils.gmk Tue Oct 23 10:10:23 2012 -0700
@@ -169,15 +169,19 @@
ifeq ($(PLATFORM),windows)
ifdef USING_CYGWIN
# Intrinsic unix command, with backslash-escaped character interpretation
- ECHO = $(UNIXCOMMAND_PATH)echo -e
- ZIPEXE = $(UNIXCOMMAND_PATH)zip
- UNZIP = $(UNIXCOMMAND_PATH)unzip
+ ECHO = $(UNIXCOMMAND_PATH)echo -e
+ ZIPEXE = $(UNIXCOMMAND_PATH)zip
+ UNZIP = $(UNIXCOMMAND_PATH)unzip
# Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
- NAWK = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
+ NAWK = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
else
ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
UNZIP = $(UTILS_DEVTOOL_PATH)unzip
NAWK = $(UNIXCOMMAND_PATH)awk
+ ifdef USING_MSYS
+ ECHO = $(UTILS_COMMAND_PATH)echo -e
+ AR = $(UTILS_DEVTOOL_PATH)ar
+ endif
endif
# Re-define some utilities
LEX =# override GNU Make intrinsic: no lex on windows