commit 087b495c3db78cb9b7c538a1b08a1ebf7e678c37
author Erik Joelsson <erikj@openjdk.org> Thu Mar 16 14:46:50 2017 +0100
committer Erik Joelsson <erikj@openjdk.org> Thu Mar 16 14:46:50 2017 +0100
tree 052b5b7a549cabefe026a2fbe02c2fcdbbd4c077
parent fe163e8f4ca8b1c51a6c591ea23a9cd3ded60793

8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION

Reviewed-by: ihse

jdk/make/copy/Copy-java.base.gmk

diff --git a/jdk/make/copy/Copy-java.base.gmk b/jdk/make/copy/Copy-java.base.gmk
index 2b85a8b..0176490 100644
--- a/jdk/make/copy/Copy-java.base.gmk
+++ b/jdk/make/copy/Copy-java.base.gmk
@@ -235,8 +235,10 @@
 
 # JDK license and assembly exception files to be packaged in JMOD
 
-JDK_LICENSE ?= $(TOPDIR)/LICENSE
-JDK_NOTICE  ?= $(TOPDIR)/ASSEMBLY_EXCEPTION
+# The license files may not be present if the source has been obtained using a
+# different license.
+JDK_LICENSE ?= $(wildcard $(TOPDIR)/LICENSE)
+JDK_NOTICE  ?= $(wildcard $(TOPDIR)/ASSEMBLY_EXCEPTION)
 
 $(eval $(call SetupCopyFiles, COPY_JDK_NOTICES, \
     FILES := $(JDK_LICENSE) $(JDK_NOTICE), \
@@ -245,4 +247,3 @@
 ))
 
 TARGETS += $(COPY_JDK_NOTICES)
-