Mercurial > hg > truffle
diff make/linux/makefiles/gcc.make @ 5946:3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
Reviewed-by: dholmes, ohair
author | erikj |
---|---|
date | Mon, 19 Mar 2012 10:09:24 +0100 |
parents | 7292cff45988 |
children | 74c359c4a9e5 |
line wrap: on
line diff
--- a/make/linux/makefiles/gcc.make Mon Mar 19 20:13:17 2012 +0100 +++ b/make/linux/makefiles/gcc.make Mon Mar 19 10:09:24 2012 +0100 @@ -72,10 +72,11 @@ VM_PICFLAG/AOUT = VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) -ifeq ($(ZERO_BUILD), true) +ifeq ($(JVM_VARIANT_ZERO), true) CFLAGS += $(LIBFFI_CFLAGS) endif -ifeq ($(SHARK_BUILD), true) +ifeq ($(JVM_VARIANT_ZEROSHARK), true) +CFLAGS += $(LIBFFI_CFLAGS) CFLAGS += $(LLVM_CFLAGS) endif CFLAGS += $(VM_PICFLAG)