Mercurial > hg > truffle

comparison make/defs.make @ 21132:fc6fd02ecf95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with f6f3f44a183051ae5ee581be7c8c6c8cbbc0d5fe
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Sun, 26 Apr 2015 20:50:30 -0700
parents 3f51d02e536f
children c2e58b2a2a76 07b088d61d5d
comparison
equal deleted inserted replaced
21131:d6d9631eb057 21132:fc6fd02ecf95
340 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre 340 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre
341 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin 341 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin
342 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib 342 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib
343 EXPORT_JRE_LIB_EXT_DIR = $(EXPORT_JRE_LIB_DIR)/ext 343 EXPORT_JRE_LIB_EXT_DIR = $(EXPORT_JRE_LIB_DIR)/ext
344 EXPORT_JRE_LIB_GRAAL_DIR = $(EXPORT_JRE_LIB_DIR)/graal 344 EXPORT_JRE_LIB_GRAAL_DIR = $(EXPORT_JRE_LIB_DIR)/graal
345 EXPORT_JRE_LIB_GRAAL_SERVICES_DIR = $(EXPORT_JRE_LIB_GRAAL_DIR)/services
345 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH) 346 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH)
346 347
347 # non-universal macosx builds need to appear universal 348 # non-universal macosx builds need to appear universal
348 ifeq ($(OS_VENDOR), Darwin) 349 ifeq ($(OS_VENDOR), Darwin)
349 ifneq ($(MACOSX_UNIVERSAL), true) 350 ifneq ($(MACOSX_UNIVERSAL), true)
355 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h 356 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h
356 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h 357 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h
357 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h 358 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h
358 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h 359 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
359 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h 360 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
361 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal-loader.jar
362 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/truffle.jar
360 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal.jar 363 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal.jar
361 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal-truffle.jar 364 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal-truffle.jar
362 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal-loader.jar 365
363 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/truffle.jar 366 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.compiler.match.MatchStatementSet
367 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.hotspot.HotSpotBackendFactory
368 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.nodes.spi.ReplacementsProvider
369 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.phases.tiers.CompilerConfiguration
370 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.truffle.hotspot.nfi.RawNativeCallNodeFactory
371 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.truffle.OptimizedCallTargetInstrumentationFactory
364 372
365 .PHONY: $(HS_ALT_MAKE)/defs.make 373 .PHONY: $(HS_ALT_MAKE)/defs.make
366 374