1.1 --- a/make/common/shared/Defs-utils.gmk Thu Oct 11 16:57:31 2012 -0700
1.2 +++ b/make/common/shared/Defs-utils.gmk Tue Oct 23 10:10:39 2012 -0700
1.3 @@ -151,16 +151,26 @@
1.4 ifeq ($(PLATFORM),windows)
1.5 ifdef USING_CYGWIN
1.6 # Intrinsic unix command, with backslash-escaped character interpretation
1.7 - ECHO = $(UNIXCOMMAND_PATH)echo -e
1.8 - ZIPEXE = $(UNIXCOMMAND_PATH)zip
1.9 - UNZIP = $(UNIXCOMMAND_PATH)unzip
1.10 + ECHO = $(UNIXCOMMAND_PATH)echo -e
1.11 + ZIPEXE = $(UNIXCOMMAND_PATH)zip
1.12 + UNZIP = $(UNIXCOMMAND_PATH)unzip
1.13 + # Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
1.14 + NAWK = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
1.15 else
1.16 - ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
1.17 - UNZIP = $(UTILS_DEVTOOL_PATH)unzip
1.18 + ifdef USING_MSYS
1.19 + ECHO = $(UTILS_COMMAND_PATH)echo -e
1.20 + ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
1.21 + UNZIP = $(UTILS_DEVTOOL_PATH)unzip
1.22 + NAWK = $(UNIXCOMMAND_PATH)awk
1.23 + else
1.24 + ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
1.25 + UNZIP = $(UTILS_DEVTOOL_PATH)unzip
1.26 + NAWK = $(UNIXCOMMAND_PATH)awk
1.27 + endif
1.28 endif
1.29 # Re-define some utilities
1.30 LEX =# override GNU Make intrinsic: no lex on windows
1.31 - NAWK = $(UNIXCOMMAND_PATH)awk
1.32 + SHA1SUM = $(UNIXCOMMAND_PATH)openssl sha1
1.33 endif
1.34
1.35 # Linux specific
