From 40fa341e3b29e38f120e3d72dec274eeca3f319a Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Thu, 16 Mar 2017 14:46:50 +0100 Subject: [PATCH] 8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION Reviewed-by: ihse --- jdk/make/copy/Copy-java.base.gmk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jdk/make/copy/Copy-java.base.gmk b/jdk/make/copy/Copy-java.base.gmk index 2b85a8b56cb..01764904187 100644 --- a/jdk/make/copy/Copy-java.base.gmk +++ b/jdk/make/copy/Copy-java.base.gmk @@ -235,8 +235,10 @@ endif # 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 @@ $(eval $(call SetupCopyFiles, COPY_JDK_NOTICES, \ )) TARGETS += $(COPY_JDK_NOTICES) -