Mercurial > hg > truffle

comparison make/windows/makefiles/defs.make @ 10408:836a62f43af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents 0380df7c3cd0
children 8a84bedf7173
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
191 # build number. It must not be zero padded. 191 # build number. It must not be zero padded.
192 ifdef COOKED_BUILD_NUMBER 192 ifdef COOKED_BUILD_NUMBER
193 MAKE_ARGS += JDK_BUILD_NUMBER=$(COOKED_BUILD_NUMBER) 193 MAKE_ARGS += JDK_BUILD_NUMBER=$(COOKED_BUILD_NUMBER)
194 endif 194 endif
195 195
196 NMAKE= MAKEFLAGS= MFLAGS= nmake -NOLOGO 196 NMAKE= MAKEFLAGS= MFLAGS= EXTRA_CFLAGS="$(EXTRA_CFLAGS)" nmake -NOLOGO
197 ifndef SYSTEM_UNAME 197 ifndef SYSTEM_UNAME
198 SYSTEM_UNAME := $(shell uname) 198 SYSTEM_UNAME := $(shell uname)
199 export SYSTEM_UNAME 199 export SYSTEM_UNAME
200 endif 200 endif
201 201