Mercurial > hg > truffle

comparison make/bsd/makefiles/vm.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 2d503de963b3
children 957c266d8bc5 37518f191ddb
comparison
equal deleted inserted replaced
5945:77591ef8983a 5946:3d7ea1dbe0de
40 40
41 # reads the generated files defining the set of .o's and the .o .h dependencies 41 # reads the generated files defining the set of .o's and the .o .h dependencies
42 -include $(DEP_DIR)/*.d 42 -include $(DEP_DIR)/*.d
43 43
44 # read machine-specific adjustments (%%% should do this via buildtree.make?) 44 # read machine-specific adjustments (%%% should do this via buildtree.make?)
45 ifeq ($(ZERO_BUILD), true) 45 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
46 include $(MAKEFILES_DIR)/zeroshark.make 46 include $(MAKEFILES_DIR)/zeroshark.make
47 else 47 else
48 include $(MAKEFILES_DIR)/$(BUILDARCH).make 48 include $(MAKEFILES_DIR)/$(BUILDARCH).make
49 endif 49 endif
50 50
269 LINK_VM = $(LINK_LIB.CXX) 269 LINK_VM = $(LINK_LIB.CXX)
270 endif 270 endif
271 271
272 LIBS_VM += $(LIBS) 272 LIBS_VM += $(LIBS)
273 endif 273 endif
274 ifeq ($(ZERO_BUILD), true) 274 ifeq ($(JVM_VARIANT_ZERO), true)
275 LIBS_VM += $(LIBFFI_LIBS) 275 LIBS_VM += $(LIBFFI_LIBS)
276 endif 276 endif
277 ifeq ($(SHARK_BUILD), true) 277 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
278 LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS)
278 LFLAGS_VM += $(LLVM_LDFLAGS) 279 LFLAGS_VM += $(LLVM_LDFLAGS)
279 LIBS_VM += $(LLVM_LIBS)
280 endif 280 endif
281 281
282 282
283 # rule for building precompiled header 283 # rule for building precompiled header
284 $(PRECOMPILED_HEADER): 284 $(PRECOMPILED_HEADER):