Mercurial > hg > truffle

comparison make/bsd/makefiles/gcc.make @ 5946:3d7ea1dbe0de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4d399f013e5a
comparison
equal deleted inserted replaced
5945:77591ef8983a 5946:3d7ea1dbe0de
103 103
104 VM_PICFLAG/LIBJVM = $(PICFLAG) 104 VM_PICFLAG/LIBJVM = $(PICFLAG)
105 VM_PICFLAG/AOUT = 105 VM_PICFLAG/AOUT =
106 VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) 106 VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
107 107
108 ifeq ($(ZERO_BUILD), true) 108 ifeq ($(JVM_VARIANT_ZERO), true)
109 CFLAGS += $(LIBFFI_CFLAGS) 109 CFLAGS += $(LIBFFI_CFLAGS)
110 endif 110 endif
111 ifeq ($(SHARK_BUILD), true) 111 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
112 CFLAGS += $(LLVM_CFLAGS) 112 CFLAGS += $(LIBFFI_CFLAGS)
113 CFLAGS += $(LLVM_CFLAGS)
113 endif 114 endif
114 CFLAGS += $(VM_PICFLAG) 115 CFLAGS += $(VM_PICFLAG)
115 CFLAGS += -fno-rtti 116 CFLAGS += -fno-rtti
116 CFLAGS += -fno-exceptions 117 CFLAGS += -fno-exceptions
117 CFLAGS += -pthread 118 CFLAGS += -pthread