From db985ef95a4e14748eb18a0789777f877fa53218 Mon Sep 17 00:00:00 2001 From: Zoltan Somogyi Date: Tue, 18 Jun 2019 00:18:00 +0200 Subject: [PATCH] Allow Java bootcheck with ALWAYS_MAKE_TAGS_FILE. --- Mmake.common.in | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Mmake.common.in b/Mmake.common.in index b8785c03d..b1662ee2e 100644 --- a/Mmake.common.in +++ b/Mmake.common.in @@ -205,10 +205,22 @@ LIBRARY_TRACE_MINIMUM = yes # The value of ENABLE_DEEP_PROFILER is either yes or no. ENABLE_DEEP_PROFILER=@ENABLE_DEEP_PROFILER@ -ifdef ALWAYS_MMAKE_TAGS_FILE -TAGS_FILE_EXISTS = tags_file_exists +# Making the tags file for a directory containing Mercury source files +# requires giving mmake access to the list of source files in the directory. +# We normally do this by having the programs' and/or libraries .dv files +# define make variables such as "mer_std.ms". +# +# Mmc --make does not create .dv files, so these make variable don't get +# defined. The resulting invocation of mtags with an empty argument list +# (the default value of an undefined make variable) would yield an error. +ifeq ($(MMAKE_USE_MMC_MAKE),yes) + TAGS_FILE_EXISTS = else -TAGS_FILE_EXISTS = + ifdef ALWAYS_MMAKE_TAGS_FILE + TAGS_FILE_EXISTS = tags_file_exists + else + TAGS_FILE_EXISTS = + endif endif #-----------------------------------------------------------------------------#