Mercurial > hg > graal-jvmci-8
changeset 20402:1202792c966e
8054970: gc src file exclusion should exclude alternative sources
Reviewed-by: ehelin, stefank
author | jcoomes |
---|---|
date | Thu, 04 Sep 2014 09:37:41 -0700 |
parents | 3f9ff5e261c6 |
children | 8ec8971f511a |
files | make/excludeSrc.make |
diffstat | 1 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/excludeSrc.make Fri Aug 22 06:28:14 2014 -0700 +++ b/make/excludeSrc.make Thu Sep 04 09:37:41 2014 -0700 @@ -21,6 +21,9 @@ # questions. # # + +include $(GAMMADIR)/make/altsrc.make + ifeq ($(INCLUDE_JVMTI), false) CXXFLAGS += -DINCLUDE_JVMTI=0 CFLAGS += -DINCLUDE_JVMTI=0 @@ -78,12 +81,12 @@ CXXFLAGS += -DINCLUDE_ALL_GCS=0 CFLAGS += -DINCLUDE_ALL_GCS=0 - gc_impl := $(GAMMADIR)/src/share/vm/gc_implementation - gc_exclude := \ - $(notdir $(wildcard $(gc_impl)/concurrentMarkSweep/*.cpp)) \ - $(notdir $(wildcard $(gc_impl)/g1/*.cpp)) \ - $(notdir $(wildcard $(gc_impl)/parallelScavenge/*.cpp)) \ - $(notdir $(wildcard $(gc_impl)/parNew/*.cpp)) + gc_impl := $(HS_COMMON_SRC)/share/vm/gc_implementation + gc_impl_alt := $(HS_ALT_SRC)/share/vm/gc_implementation + gc_subdirs := concurrentMarkSweep g1 parallelScavenge parNew + gc_exclude := $(foreach gc,$(gc_subdirs), \ + $(notdir $(wildcard $(gc_impl)/$(gc)/*.cpp)) \ + $(notdir $(wildcard $(gc_impl_alt)/$(gc)/*.cpp))) Src_Files_EXCLUDE += $(gc_exclude) # Exclude everything in $(gc_impl)/shared except the files listed