From 1fa2af5b82cd5b7117caaa05cb94af12f528991f Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Wed, 14 Nov 2018 09:34:46 +0100
Subject: [PATCH] 8213736: Build fails with LOG=debug on F28 after JDK-8210958

Add --no-print-directory to make invocation of create-main-targets-include

Reviewed-by: erikj, tbell
---
 make/InitSupport.gmk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/make/InitSupport.gmk b/make/InitSupport.gmk
index 8f2d2b92707..1bf64a0982b 100644
--- a/make/InitSupport.gmk
+++ b/make/InitSupport.gmk
@@ -264,9 +264,13 @@ ifeq ($(HAS_SPEC),)
       endif
     endif
 
+    # The --no-print-directory is needed to make the call from
+    # FindTest.gmk to Test.gmk work with LOG=debug/trace. See
+    # JDK-8213736
     $$(main_targets_file):
 	@( cd $$(topdir) && \
-	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(topdir)/make/Main.gmk \
+	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R --no-print-directory \
+	    -f $$(topdir)/make/Main.gmk \
 	    -I $$(topdir)/make/common SPEC=$(strip $2) NO_RECIPES=true \
 	    $$(MAKE_LOG_VARS) \
 	    create-main-targets-include )