diff options
| author | ohair <none@none> | 2011-01-05 17:24:58 -0800 |
|---|---|---|
| committer | ohair <none@none> | 2011-01-05 17:24:58 -0800 |
| commit | 3329cd24ad284a919024229f415f329122778239 (patch) | |
| tree | 7320e5c87b083876a1e8890e5fbd50e419159504 /make | |
| parent | 3b6e548a720ac860d5c77be8054959ff689162e2 (diff) | |
7009969: Remove SKIP_OPENJDK_BUILD from top Makefile
Reviewed-by: robilad
Diffstat (limited to 'make')
| -rw-r--r-- | make/Defs-internal.gmk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk index 907ee95..fe8403f 100644 --- a/make/Defs-internal.gmk +++ b/make/Defs-internal.gmk @@ -147,7 +147,7 @@ ifndef BUILD_SPONSORS endif -# Do we build the source and openjdk binary plug bundles? +# Do we build the source bundles? BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk ifeq ($(SKIP_BUNDLES_BUILD), true) BUNDLE_RULES_AVAILABLE := false @@ -171,7 +171,6 @@ ifdef OPENJDK ifndef SKIP_COMPARE_IMAGES SKIP_COMPARE_IMAGES = true endif - SKIP_OPENJDK_BUILD = true else # Various non-OPENJDK reasons to NOT build the deploy repository @@ -187,21 +186,11 @@ else endif endif - ifndef SKIP_OPENJDK_BUILD - #SKIP_OPENJDK_BUILD = false - # Until 6675289 is resolved, or this feature is removed. - SKIP_OPENJDK_BUILD = true - endif endif ifndef SKIP_PRODUCT_BUILD SKIP_PRODUCT_BUILD = false endif -# Solaris 64 bit builds are not complete enough to ever do this -ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64) - SKIP_OPENJDK_BUILD = true -endif - # Many reasons why we would want to skip the comparison to previous jdk ifndef SKIP_COMPARE_IMAGES ifeq ($(BUILD_JDK), false) |