diff make/defs.make @ 21978:f0a982a28944

relax verify_defs_make in jvmci.make for conditional exports
author Doug Simon <doug.simon@oracle.com>
date Tue, 16 Jun 2015 11:25:50 +0200
parents 35300ccb3eb0
children 0e095e2c24e2
line wrap: on
line diff
--- a/make/defs.make	Mon Jun 15 11:36:11 2015 +0200
+++ b/make/defs.make	Tue Jun 16 11:25:50 2015 +0200
@@ -373,7 +373,7 @@
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.jvmci.debug.TTYStreamProvider
 
 ifneq ("$(wildcard $(SHARED_DIR)/services/com.oracle.jvmci.hotspot.events.EventProvider)","")
-EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.jvmci.hotspot.events.EventProvider
+CONDITIONAL_EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.jvmci.hotspot.events.EventProvider
 endif
 
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.hotspot.HotSpotConstantReflectionProvider
@@ -384,6 +384,9 @@
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.compiler.Compiler
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.debug.JVMCIDebugConfig
 
+# The use of CONDITIONAL_EXPORT_LIST is for the checking
+# done by verify_defs_make in jvmci.make
+EXPORT_LIST += $(CONDITIONAL_EXPORT_LIST)
 
 .PHONY: $(HS_ALT_MAKE)/defs.make