Mercurial > hg > truffle
comparison make/solaris/makefiles/buildtree.make @ 5897:7292cff45988
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 | 74c359c4a9e5 |
comparison
equal
deleted
inserted
replaced
5896:b5ab7482dbf9 | 5897:7292cff45988 |
---|---|
53 # test_gamma - script to run the Queens program | 53 # test_gamma - script to run the Queens program |
54 # | 54 # |
55 # The makefiles are split this way so that "make foo" will run faster by not | 55 # The makefiles are split this way so that "make foo" will run faster by not |
56 # having to read the dependency files for the vm. | 56 # having to read the dependency files for the vm. |
57 | 57 |
58 -include $(SPEC) | |
58 include $(GAMMADIR)/make/scm.make | 59 include $(GAMMADIR)/make/scm.make |
59 include $(GAMMADIR)/make/altsrc.make | 60 include $(GAMMADIR)/make/altsrc.make |
60 | 61 |
61 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details. | 62 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details. |
62 QUIETLY$(MAKE_VERBOSE) = @ | 63 QUIETLY$(MAKE_VERBOSE) = @ |
235 [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \ | 236 [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \ |
236 echo && \ | 237 echo && \ |
237 echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \ | 238 echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \ |
238 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \ | 239 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \ |
239 echo; \ | 240 echo; \ |
241 [ -n "$(SPEC)" ] && \ | |
242 echo "include $(SPEC)"; \ | |
240 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \ | 243 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \ |
241 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \ | 244 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \ |
242 ) > $@ | 245 ) > $@ |
243 | 246 |
244 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst | 247 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst |