Mercurial > hg > truffle

changeset 2470:b025bffd6c2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7032775: Include Shark code in the build again Reviewed-by: ohair Contributed-by: gbenson@redhat.com, ahughes@redhat.com
author dholmes
date Thu, 31 Mar 2011 06:54:30 -0400
parents 677234770800
children 37be97a58393
files make/linux/makefiles/vm.make
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/linux/makefiles/vm.make	Wed Mar 30 19:38:07 2011 +0400
+++ b/make/linux/makefiles/vm.make	Thu Mar 31 06:54:30 2011 -0400
@@ -142,13 +142,15 @@
 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
 COMPILER2_PATHS += $(GENERATED)/adfiles
 
+SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
+
 # 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/ZERO      := $(CORE_PATHS)
-Src_Dirs/SHARK     := $(CORE_PATHS)
+Src_Dirs/SHARK     := $(CORE_PATHS) $(SHARK_PATHS)
 Src_Dirs := $(Src_Dirs/$(TYPE))
 
 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*