Mercurial > hg > graal-jvmci-8

diff make/defs.make @ 21791:cd36556e1b78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove conditional makefile-based compilation of jvmci from mx_graal.py
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Mon, 08 Jun 2015 14:25:25 +0200
parents 3d15183f3c93
children 44bad469bec2
line wrap: on
line diff
--- a/make/defs.make	Fri Jun 05 16:28:19 2015 +0200
+++ b/make/defs.make	Mon Jun 08 14:25:25 2015 +0200
@@ -376,6 +376,7 @@
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.hotspot.CompileTheWorld
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.compiler.Compiler
 
+<<<<<<< local
 ifeq ($(JVMCI_USE_MAKE),)
 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/truffle.jar
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_DIR)/graal.jar
@@ -434,6 +435,8 @@
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.graal.lir.asm.CompilationResultBuilder
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.graal.java.BytecodeParser
 endif
+=======
+>>>>>>> other
 
 .PHONY: $(HS_ALT_MAKE)/defs.make