Mercurial > hg > graal-jvmci-8
comparison make/linux/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 | 3d7ea1dbe0de |
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 | 62 |
62 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details. | 63 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details. |
242 [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \ | 243 [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \ |
243 echo && \ | 244 echo && \ |
244 echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \ | 245 echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \ |
245 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \ | 246 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \ |
246 echo; \ | 247 echo; \ |
248 [ -n "$(SPEC)" ] && \ | |
249 echo "include $(SPEC)"; \ | |
247 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \ | 250 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \ |
248 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \ | 251 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \ |
249 ) > $@ | 252 ) > $@ |
250 | 253 |
251 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst | 254 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst |