Mercurial > hg > truffle
diff make/bsd/makefiles/vm.make @ 7154:5d0bb7d52783
changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 12 Dec 2012 21:36:40 +0100 |
| parents | 1baf7f1e3f23 |
| children | 989155e2d07a |
line wrap: on
line diff
--- a/make/bsd/makefiles/vm.make Wed Dec 12 15:46:11 2012 +0100 +++ b/make/bsd/makefiles/vm.make Wed Dec 12 21:36:40 2012 +0100 @@ -180,9 +180,9 @@ # Include dirs per type. Src_Dirs/CORE := $(CORE_PATHS) -Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) -Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) -Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) +Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS) +Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS) +Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS) Src_Dirs/ZERO := $(CORE_PATHS) Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) Src_Dirs/GRAAL := $(CORE_PATHS) $(GRAAL_PATHS) @@ -192,7 +192,12 @@ COMPILER1_SPECIFIC_FILES := c1_\* SHARK_SPECIFIC_FILES := shark ZERO_SPECIFIC_FILES := zero -GRAAL_SPECIFIC_FILES := graal\* + +ifdef OMIT_GRAAL + GRAAL_SPECIFIC_FILES := graal\* +else + GRAAL_SPECIFIC_FILES := +endif # Always exclude these. Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp