diff 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
line wrap: on
line diff
--- a/make/defs.make	Wed Apr 15 20:05:51 2015 +0200
+++ b/make/defs.make	Mon Apr 20 17:56:38 2015 +0200
@@ -341,6 +341,7 @@
 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin
 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib
 EXPORT_JRE_LIB_EXT_DIR = $(EXPORT_JRE_LIB_DIR)/ext
+EXPORT_JRE_LIB_GRAAL_DIR = $(EXPORT_JRE_LIB_DIR)/graal
 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH)
 
 # non-universal macosx builds need to appear universal
@@ -356,8 +357,8 @@
 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h
 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
-EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal.jar
-EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal-truffle.jar
+EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal.jar
+EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal-truffle.jar
 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal-loader.jar
 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/truffle.jar