Mercurial > hg > truffle

comparison make/defs.make @ 8212:ed3fa3ae7b61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applied patch to Makefile system for building graal.jar (CR-102)
author Doug Simon <doug.simon@oracle.com>
date Mon, 11 Mar 2013 18:57:12 +0100
parents fb19af007ffc
children b9a918201d47
comparison
equal deleted inserted replaced
8205:9efef773f521 8212:ed3fa3ae7b61
232 232
233 # Default jdk image if one is created for you with create_jdk 233 # Default jdk image if one is created for you with create_jdk
234 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM) 234 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
235 ifneq ($(ALT_JDK_IMAGE_DIR),) 235 ifneq ($(ALT_JDK_IMAGE_DIR),)
236 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR) 236 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
237 endif
238
239 # Utilities ant
240 ifeq ($(PLATFORM), windows)
241 ifeq ($(ANT_HOME),)
242 ANT_HOME := $(call DirExists,$(JDK_DEVTOOLS_DIR)/share/ant/latest,,)
243 endif
244 endif
245
246 # There are few problems with ant we need to workaround:
247 # 1) ant is using temporary directory java.io.tmpdir
248 # However, this directory is not unique enough and two separate ant processes
249 # can easily end up using the exact same temp directory. This may lead to weird build failures
250 # To workaround this we will define tmp dir explicitly
251 # 2) ant attempts to detect JDK location based on java.exe location
252 # This is fragile as developer may have JRE first on the PATH.
253 # To workaround this we will specify JAVA_HOME explicitly
254 # 3) Sometimes we need to run ant with the boot jdk, sometimes with the import
255 # jdk, sometimes with the jdk we are building (see deploy repo).
256
257 ANT_TMPDIR = $(OUTPUTDIR)/tmp
258 ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'
259
260 ifeq ($(ANT_HOME),)
261 ANT = $(ANT_WORKAROUNDS) JAVA_HOME='$(BOOTDIR)' ant
262 else
263 ANT = $(ANT_WORKAROUNDS) JAVA_HOME='$(BOOTDIR)' $(ANT_HOME)/bin/ant
237 endif 264 endif
238 265
239 # The platform dependent defs.make defines platform specific variable such 266 # The platform dependent defs.make defines platform specific variable such
240 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined. 267 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
241 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make 268 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
334 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h 361 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h
335 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h 362 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h
336 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h 363 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h
337 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h 364 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
338 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h 365 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
366 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal.jar
339 367
340 # By default, run Queens test after building 368 # By default, run Queens test after building
341 TEST_IN_BUILD ?= true 369 TEST_IN_BUILD ?= true
342 370
343 ifndef JAVASE_EMBEDDED 371 ifndef JAVASE_EMBEDDED