Mercurial > hg > truffle

comparison make/defs.make @ 8883:b9a918201d47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hsx25
author Gilles Duboscq <duboscq@ssw.jku.at>
date Sat, 06 Apr 2013 20:04:06 +0200
parents ed3fa3ae7b61 98f3af397705
children 836a62f43af9
comparison
equal deleted inserted replaced
8660:d47b52b0ff68 8883:b9a918201d47
327 327
328 LP64_ARCH = sparcv9 amd64 ia64 zero 328 LP64_ARCH = sparcv9 amd64 ia64 zero
329 endif 329 endif
330 330
331 # Required make macro settings for all platforms 331 # Required make macro settings for all platforms
332 MAKE_ARGS += JAVA_HOME=$(ABS_BOOTDIR) 332 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR)
333 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) 333 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR)
334 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) 334 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR)
335 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) 335 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE)
336 MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) 336 MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION)
337 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 337 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
363 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h 363 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h
364 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h 364 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
365 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h 365 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
366 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal.jar 366 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal.jar
367 367
368 # By default, run Queens test after building
369 TEST_IN_BUILD ?= true
370
371 ifndef JAVASE_EMBEDDED 368 ifndef JAVASE_EMBEDDED
372 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h 369 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h
373 endif 370 endif
374 371
375 .PHONY: $(HS_ALT_MAKE)/defs.make 372 .PHONY: $(HS_ALT_MAKE)/defs.make