1.1 --- a/make/bsd/makefiles/gcc.make Mon Mar 19 20:13:17 2012 +0100 1.2 +++ b/make/bsd/makefiles/gcc.make Mon Mar 19 10:09:24 2012 +0100 1.3 @@ -105,11 +105,12 @@ 1.4 VM_PICFLAG/AOUT = 1.5 VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) 1.6 1.7 -ifeq ($(ZERO_BUILD), true) 1.8 -CFLAGS += $(LIBFFI_CFLAGS) 1.9 +ifeq ($(JVM_VARIANT_ZERO), true) 1.10 + CFLAGS += $(LIBFFI_CFLAGS) 1.11 endif 1.12 -ifeq ($(SHARK_BUILD), true) 1.13 -CFLAGS += $(LLVM_CFLAGS) 1.14 +ifeq ($(JVM_VARIANT_ZEROSHARK), true) 1.15 + CFLAGS += $(LIBFFI_CFLAGS) 1.16 + CFLAGS += $(LLVM_CFLAGS) 1.17 endif 1.18 CFLAGS += $(VM_PICFLAG) 1.19 CFLAGS += -fno-rtti