comparison make/bsd/Makefile @ 6275:957c266d8bc5

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Aug 2012 10:39:19 +0200
parents 33df1aeaebbf 3d7ea1dbe0de
children e522a00b91aa
comparison
equal deleted inserted replaced
5891:fd8832ae511d 6275:957c266d8bc5
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))