Mercurial > hg > truffle

comparison make/linux/Makefile @ 6152:958bb4b7be49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Tue, 10 Apr 2012 10:42:34 -0700
parents 3d7ea1dbe0de
children 74c359c4a9e5
comparison
equal deleted inserted replaced
6151:e778c29768e6 6152:958bb4b7be49
186 186
187 # This target list needs to be coordinated with the usage message 187 # This target list needs to be coordinated with the usage message
188 # in the build.sh script: 188 # in the build.sh script:
189 TARGETS = debug jvmg fastdebug optimized profiled product 189 TARGETS = debug jvmg fastdebug optimized profiled product
190 190
191 ifeq ($(ZERO_BUILD), true) 191 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
192 SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs 192 SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs
193 else 193 else
194 SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs 194 SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
195 endif 195 endif
196 SUBDIRS_C1 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS)) 196 SUBDIRS_C1 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS))