Mercurial > hg > graal-jvmci-8
comparison make/defs.make @ 8798:e3a41fc02348 hs25-b24
Merge
author | amurillo |
---|---|
date | Sat, 23 Mar 2013 01:47:24 -0700 |
parents | 98f3af397705 |
children | b9a918201d47 f2110083203d |
comparison
equal
deleted
inserted
replaced
8748:4f7380dca47e | 8798:e3a41fc02348 |
---|---|
300 | 300 |
301 LP64_ARCH = sparcv9 amd64 ia64 zero | 301 LP64_ARCH = sparcv9 amd64 ia64 zero |
302 endif | 302 endif |
303 | 303 |
304 # Required make macro settings for all platforms | 304 # Required make macro settings for all platforms |
305 MAKE_ARGS += JAVA_HOME=$(ABS_BOOTDIR) | 305 MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR) |
306 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) | 306 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) |
307 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) | 307 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) |
308 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) | 308 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) |
309 MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) | 309 MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) |
310 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) | 310 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
335 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h | 335 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h |
336 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h | 336 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h |
337 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h | 337 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h |
338 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h | 338 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h |
339 | 339 |
340 # By default, run Queens test after building | |
341 TEST_IN_BUILD ?= true | |
342 | |
343 ifndef JAVASE_EMBEDDED | 340 ifndef JAVASE_EMBEDDED |
344 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h | 341 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h |
345 endif | 342 endif |
346 | 343 |
347 .PHONY: $(HS_ALT_MAKE)/defs.make | 344 .PHONY: $(HS_ALT_MAKE)/defs.make |