changeset 16873:832ae841344c

8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION Reviewed-by: ihse
author erikj
date Thu, 16 Mar 2017 14:46:50 +0100
parents 5548e024cbcf
children 7b8e364b2faf
files make/copy/Copy-java.base.gmk
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/copy/Copy-java.base.gmk	Wed Mar 15 19:24:56 2017 -0700
+++ b/make/copy/Copy-java.base.gmk	Thu Mar 16 14:46:50 2017 +0100
@@ -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)
-