Mercurial > hg > graal-jvmci-8
comparison make/defs.make @ 22398:4f6caa445b92
moved JVMCI option parsing back into Java
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 04 Aug 2015 00:47:34 +0200 |
parents | 528eeeca785e |
children | 1bbd4a7c274b |
comparison
equal
deleted
inserted
replaced
22397:7202e96981c6 | 22398:4f6caa445b92 |
---|---|
346 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin | 346 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin |
347 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib | 347 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib |
348 EXPORT_JRE_LIB_EXT_DIR = $(EXPORT_JRE_LIB_DIR)/ext | 348 EXPORT_JRE_LIB_EXT_DIR = $(EXPORT_JRE_LIB_DIR)/ext |
349 EXPORT_JRE_LIB_JVMCI_DIR = $(EXPORT_JRE_LIB_DIR)/jvmci | 349 EXPORT_JRE_LIB_JVMCI_DIR = $(EXPORT_JRE_LIB_DIR)/jvmci |
350 EXPORT_JRE_LIB_JVMCI_SERVICES_DIR = $(EXPORT_JRE_LIB_JVMCI_DIR)/services | 350 EXPORT_JRE_LIB_JVMCI_SERVICES_DIR = $(EXPORT_JRE_LIB_JVMCI_DIR)/services |
351 EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR = $(EXPORT_JRE_LIB_JVMCI_DIR)/options | |
352 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH) | 351 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH) |
353 | 352 |
354 # non-universal macosx builds need to appear universal | 353 # non-universal macosx builds need to appear universal |
355 ifeq ($(OS_VENDOR), Darwin) | 354 ifeq ($(OS_VENDOR), Darwin) |
356 ifneq ($(MACOSX_UNIVERSAL), true) | 355 ifneq ($(MACOSX_UNIVERSAL), true) |
372 | 371 |
373 ifneq ("$(wildcard $(SHARED_DIR)/services/jdk.internal.jvmci.hotspot.events.EventProvider)","") | 372 ifneq ("$(wildcard $(SHARED_DIR)/services/jdk.internal.jvmci.hotspot.events.EventProvider)","") |
374 CONDITIONAL_EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/jdk.internal.jvmci.hotspot.events.EventProvider | 373 CONDITIONAL_EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/jdk.internal.jvmci.hotspot.events.EventProvider |
375 endif | 374 endif |
376 | 375 |
377 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/jdk.internal.jvmci.compiler.Compiler | |
378 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/jdk.internal.jvmci.hotspot.HotSpotConstantPool | |
379 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/jdk.internal.jvmci.hotspot.HotSpotConstantReflectionProvider | |
380 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime | |
381 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/jdk.internal.jvmci.hotspot.HotSpotResolvedJavaFieldImpl | |
382 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethodImpl | |
383 | |
384 # The use of CONDITIONAL_EXPORT_LIST is for the checking | 376 # The use of CONDITIONAL_EXPORT_LIST is for the checking |
385 # done by verify_defs_make in jvmci.make | 377 # done by verify_defs_make in jvmci.make |
386 EXPORT_LIST += $(CONDITIONAL_EXPORT_LIST) | 378 EXPORT_LIST += $(CONDITIONAL_EXPORT_LIST) |
387 | 379 |
388 .PHONY: $(HS_ALT_MAKE)/defs.make | 380 .PHONY: $(HS_ALT_MAKE)/defs.make |