Mercurial > hg > truffle

comparison make/linux/makefiles/vm.make @ 6856:9855b7e559ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author collins
date Fri, 12 Oct 2012 10:49:39 -0700
parents 75982791ddb6 fb19af007ffc
children 857f3ce858dd
comparison
equal deleted inserted replaced
6842:b9a9ed0f8eeb 6856:9855b7e559ae
190 COMPILER1_SPECIFIC_FILES := c1_\* 190 COMPILER1_SPECIFIC_FILES := c1_\*
191 SHARK_SPECIFIC_FILES := shark 191 SHARK_SPECIFIC_FILES := shark
192 ZERO_SPECIFIC_FILES := zero 192 ZERO_SPECIFIC_FILES := zero
193 193
194 # Always exclude these. 194 # Always exclude these.
195 Src_Files_EXCLUDE := jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 195 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
196 196
197 # Exclude per type. 197 # Exclude per type.
198 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 198 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
199 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 199 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
200 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 200 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)