Mercurial > hg > truffle

comparison make/bsd/makefiles/buildtree.make @ 5897:7292cff45988

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable Reviewed-by: dholmes, ohrstrom, ohair, jcoomes
author erikj
date Wed, 22 Feb 2012 09:24:35 +0100
parents e8a4934564b2
children 3d7ea1dbe0de
comparison
equal deleted inserted replaced
5896:b5ab7482dbf9 5897:7292cff45988
56 # having to read the dependency files for the vm. 56 # having to read the dependency files for the vm.
57 57
58 # needs to be set here since this Makefile doesn't include defs.make 58 # needs to be set here since this Makefile doesn't include defs.make
59 OS_VENDOR:=$(shell uname -s) 59 OS_VENDOR:=$(shell uname -s)
60 60
61 -include $(SPEC)
61 include $(GAMMADIR)/make/scm.make 62 include $(GAMMADIR)/make/scm.make
62 include $(GAMMADIR)/make/altsrc.make 63 include $(GAMMADIR)/make/altsrc.make
63 64
64 65
65 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details. 66 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details.
245 [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \ 246 [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
246 echo && \ 247 echo && \
247 echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \ 248 echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
248 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \ 249 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
249 echo; \ 250 echo; \
251 [ -n "$(SPEC)" ] && \
252 echo "include $(SPEC)"; \
250 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \ 253 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
251 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \ 254 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
252 ) > $@ 255 ) > $@
253 256
254 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst 257 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst