comparison make/Defs-internal.gmk @ 286:6db0e6f221bd

7009969: Remove SKIP_OPENJDK_BUILD from top Makefile Reviewed-by: robilad
author ohair
date Wed, 05 Jan 2011 17:24:58 -0800
parents 024a6755895b
children ce02c0d73d6a
comparison
equal deleted inserted replaced
17:b3ea37f7c02c 18:cdbeeb4a0404
145 BUILD_SPONSORS := $(SPONSORS_SRC_AVAILABLE) 145 BUILD_SPONSORS := $(SPONSORS_SRC_AVAILABLE)
146 endif 146 endif
147 endif 147 endif
148 148
149 149
150 # Do we build the source and openjdk binary plug bundles? 150 # Do we build the source bundles?
151 BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk 151 BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
152 ifeq ($(SKIP_BUNDLES_BUILD), true) 152 ifeq ($(SKIP_BUNDLES_BUILD), true)
153 BUNDLE_RULES_AVAILABLE := false 153 BUNDLE_RULES_AVAILABLE := false
154 else 154 else
155 BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES)) 155 BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
169 SKIP_DEBUG_BUILD = true 169 SKIP_DEBUG_BUILD = true
170 endif 170 endif
171 ifndef SKIP_COMPARE_IMAGES 171 ifndef SKIP_COMPARE_IMAGES
172 SKIP_COMPARE_IMAGES = true 172 SKIP_COMPARE_IMAGES = true
173 endif 173 endif
174 SKIP_OPENJDK_BUILD = true
175 else 174 else
176 175
177 # Various non-OPENJDK reasons to NOT build the deploy repository 176 # Various non-OPENJDK reasons to NOT build the deploy repository
178 ifeq ($(ARCH), ia64) 177 ifeq ($(ARCH), ia64)
179 BUILD_DEPLOY=false 178 BUILD_DEPLOY=false
185 ifeq ($(PLATFORM), solaris) 184 ifeq ($(PLATFORM), solaris)
186 BUILD_DEPLOY=false 185 BUILD_DEPLOY=false
187 endif 186 endif
188 endif 187 endif
189 188
190 ifndef SKIP_OPENJDK_BUILD
191 #SKIP_OPENJDK_BUILD = false
192 # Until 6675289 is resolved, or this feature is removed.
193 SKIP_OPENJDK_BUILD = true
194 endif
195 endif 189 endif
196 ifndef SKIP_PRODUCT_BUILD 190 ifndef SKIP_PRODUCT_BUILD
197 SKIP_PRODUCT_BUILD = false 191 SKIP_PRODUCT_BUILD = false
198 endif
199
200 # Solaris 64 bit builds are not complete enough to ever do this
201 ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
202 SKIP_OPENJDK_BUILD = true
203 endif 192 endif
204 193
205 # Many reasons why we would want to skip the comparison to previous jdk 194 # Many reasons why we would want to skip the comparison to previous jdk
206 ifndef SKIP_COMPARE_IMAGES 195 ifndef SKIP_COMPARE_IMAGES
207 ifeq ($(BUILD_JDK), false) 196 ifeq ($(BUILD_JDK), false)