Merge
This commit is contained in:
commit
1cad37e136
@ -53,3 +53,4 @@ d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
|
||||
c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
|
||||
1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
|
||||
ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
|
||||
20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
|
||||
|
@ -231,9 +231,11 @@ endif
|
||||
ifndef NO_DOCS
|
||||
# Default value (we want javadoc run)
|
||||
GENERATE_DOCS=true
|
||||
# No DOCS build when JDK_UPDATE_VERSION set
|
||||
ifdef JDK_UPDATE_VERSION
|
||||
GENERATE_DOCS=false
|
||||
# No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds
|
||||
ifndef OPENJDK
|
||||
ifdef JDK_UPDATE_VERSION
|
||||
GENERATE_DOCS=false
|
||||
endif
|
||||
endif
|
||||
# If langtools, corba, jaxp, and jaxws are not being built,
|
||||
# a full jdk javadoc is not possible
|
||||
|
Loading…
x
Reference in New Issue
Block a user