OpenJDK / amber / amber
changeset 44264:8ff59e9e832c
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 | 7a9297d467e7 |
| children | ac63ae089927 |
| files | jdk/make/copy/Copy-java.base.gmk |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/copy/Copy-java.base.gmk Wed Mar 15 19:24:56 2017 -0700 +++ b/jdk/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) -