Mercurial > hg > graal-compiler
changeset 11170:a4b9a8ec8f4a
Merge
author | jiangli |
---|---|
date | Thu, 25 Jul 2013 18:12:02 -0400 |
parents | 6efedc114807 (current diff) 01aa164323fa (diff) |
children | 46487ba40ff2 b6baf306e698 |
files | |
diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/makefiles/vm.make Wed Jul 24 13:54:03 2013 -0700 +++ b/make/linux/makefiles/vm.make Thu Jul 25 18:12:02 2013 -0400 @@ -212,6 +212,12 @@ Src_Files_EXCLUDE += \*x86_32\* endif +# Alternate vm.make +# This has to be included here to allow changes to the source +# directories and excluded files before they are expanded +# by the definition of Src_Files. +-include $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/vm.make + # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE. define findsrc $(notdir $(shell find $(1)/. ! -name . -prune \ @@ -381,4 +387,4 @@ install: install_jvm install_jsig install_saproc -.PHONY: default build install install_jvm $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make +.PHONY: default build install install_jvm $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/vm.make