jdk/make/common/shared/Defs-utils.gmk
changeset 14091 e5c8662f325d
parent 12047 320a714614e9
child 14342 8435a30053c1
equal deleted inserted replaced
14066:cdaa6122185f 14091:e5c8662f325d
   167 
   167 
   168 # Windows specific
   168 # Windows specific
   169 ifeq ($(PLATFORM),windows)
   169 ifeq ($(PLATFORM),windows)
   170   ifdef USING_CYGWIN
   170   ifdef USING_CYGWIN
   171     # Intrinsic unix command, with backslash-escaped character interpretation
   171     # Intrinsic unix command, with backslash-escaped character interpretation
   172     ECHO = $(UNIXCOMMAND_PATH)echo -e
   172     ECHO     = $(UNIXCOMMAND_PATH)echo -e
   173     ZIPEXE = $(UNIXCOMMAND_PATH)zip
   173     ZIPEXE   = $(UNIXCOMMAND_PATH)zip
   174     UNZIP  = $(UNIXCOMMAND_PATH)unzip
   174     UNZIP    = $(UNIXCOMMAND_PATH)unzip
   175     # Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
   175     # Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
   176     NAWK   = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
   176     NAWK     = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
   177   else
   177   else
   178     ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
   178     ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
   179     UNZIP  = $(UTILS_DEVTOOL_PATH)unzip
   179     UNZIP  = $(UTILS_DEVTOOL_PATH)unzip
   180     NAWK   = $(UNIXCOMMAND_PATH)awk
   180     NAWK   = $(UNIXCOMMAND_PATH)awk
       
   181     ifdef USING_MSYS
       
   182       ECHO   = $(UTILS_COMMAND_PATH)echo -e
       
   183       AR     = $(UTILS_DEVTOOL_PATH)ar
       
   184     endif
   181   endif
   185   endif
   182   # Re-define some utilities
   186   # Re-define some utilities
   183   LEX            =# override GNU Make intrinsic: no lex on windows
   187   LEX            =# override GNU Make intrinsic: no lex on windows
   184   SHA1SUM        = $(UNIXCOMMAND_PATH)openssl sha1
   188   SHA1SUM        = $(UNIXCOMMAND_PATH)openssl sha1
   185 endif
   189 endif