1.1 --- a/make/sanity-rules.gmk Mon Nov 02 00:03:32 2009 -0800 1.2 +++ b/make/sanity-rules.gmk Wed Nov 18 16:41:09 2009 -0800 1.3 @@ -204,13 +204,9 @@ 1.4 "" >> $(WARNING_FILE) 1.5 endif 1.6 endif 1.7 -ifndef OPENJDK 1.8 - ifdef NO_DOCS 1.9 - @$(ECHO) "WARNING: Your build environment has the variable NO_DOCS\n" \ 1.10 - " defined. This will result in a development-only\n" \ 1.11 - " build of the JDK, lacking the documentation.\n" \ 1.12 +ifeq ($(GENERATE_DOCS),false) 1.13 + @$(ECHO) "WARNING: This build does not include running javadoc.\n" \ 1.14 "" >> $(WARNING_FILE) 1.15 - endif 1.16 endif 1.17 ifdef NO_IMAGES 1.18 @$(ECHO) "WARNING: Your build environment has the variable NO_IMAGES\n" \ 1.19 @@ -355,4 +351,4 @@ 1.20 .PHONY: sanity settings pre-sanity insane \ 1.21 post-sanity post-sanity-hotspot post-sanity-jdk \ 1.22 post-sanity-install post-sanity-deploy \ 1.23 - alt_bootdir bootdir 1.24 + alt_bootdir bootdir environment