make/bsd/makefiles/gcc.make

*** 103,117 ****
  
  VM_PICFLAG/LIBJVM = $(PICFLAG)
  VM_PICFLAG/AOUT   =
  VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
  
! ifeq ($(ZERO_BUILD), true)
! CFLAGS += $(LIBFFI_CFLAGS)
  endif
! ifeq ($(SHARK_BUILD), true)
! CFLAGS += $(LLVM_CFLAGS)
  endif
  CFLAGS += $(VM_PICFLAG)
  CFLAGS += -fno-rtti
  CFLAGS += -fno-exceptions
  CFLAGS += -pthread
--- 103,118 ----
  
  VM_PICFLAG/LIBJVM = $(PICFLAG)
  VM_PICFLAG/AOUT   =
  VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
  
! ifeq ($(JVM_VARIANT_ZERO), true)
!   CFLAGS += $(LIBFFI_CFLAGS)
  endif
! ifeq ($(JVM_VARIANT_ZEROSHARK), true)
!   CFLAGS += $(LIBFFI_CFLAGS)
!   CFLAGS += $(LLVM_CFLAGS)
  endif
  CFLAGS += $(VM_PICFLAG)
  CFLAGS += -fno-rtti
  CFLAGS += -fno-exceptions
  CFLAGS += -pthread