comparison make/defs.make @ 21040:12e94cba3696

Graal Loader: load all jars matching lib/graal/graal*.jar
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Mon, 20 Apr 2015 17:56:38 +0200
parents 52b4284cb496
children 3f51d02e536f
comparison
equal deleted inserted replaced
21039:13a255e29236 21040:12e94cba3696
339 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib 339 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib
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_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH) 345 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH)
345 346
346 # non-universal macosx builds need to appear universal 347 # non-universal macosx builds need to appear universal
347 ifeq ($(OS_VENDOR), Darwin) 348 ifeq ($(OS_VENDOR), Darwin)
348 ifneq ($(MACOSX_UNIVERSAL), true) 349 ifneq ($(MACOSX_UNIVERSAL), true)
354 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h 355 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h
355 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h 356 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h
356 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h 357 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h
357 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h 358 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
358 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h 359 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
359 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal.jar 360 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal.jar
360 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal-truffle.jar 361 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal-truffle.jar
361 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal-loader.jar 362 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal-loader.jar
362 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/truffle.jar 363 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/truffle.jar
363 364
364 .PHONY: $(HS_ALT_MAKE)/defs.make 365 .PHONY: $(HS_ALT_MAKE)/defs.make
365 366