changeset 2368:326cbee3e265

8170392: JDK-8031567 broke builds from source bundles Reviewed-by: sla
author erikj
date Mon, 28 Nov 2016 15:19:08 +0100
parents 84669e1b01fe
children 8fff0f216fb8
files make/Images.gmk make/SourceRevision.gmk
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/Images.gmk	Mon Nov 28 10:13:18 2016 +0100
+++ b/make/Images.gmk	Mon Nov 28 15:19:08 2016 +0100
@@ -100,7 +100,8 @@
       $(CAT) $(SOURCE_REVISION_TRACKER) ; \
     fi)
 
-$(BASE_RELEASE_FILE): $(INFO_FILE_VARDEPS) $(SOURCE_REVISION_TRACKER)
+# The SOURCE_REVISION_TRACKER file may not exist. Only depend on it if it does.
+$(BASE_RELEASE_FILE): $(INFO_FILE_VARDEPS) $(wildcard $(SOURCE_REVISION_TRACKER))
 	$(info-file)
 
 ################################################################################
--- a/make/SourceRevision.gmk	Mon Nov 28 10:13:18 2016 +0100
+++ b/make/SourceRevision.gmk	Mon Nov 28 15:19:08 2016 +0100
@@ -119,8 +119,7 @@
 	exit 2
 
     create-source-revision-tracker:
-	$(call LogWarn, Error: No mercurial configuration present and no .src-rev)
-	exit 2
+	$(call LogWarn, Warning: No mercurial configuration present and no .src-rev)
   endif
 
 endif