make/Main.gmk

rev 53723 : 8218807: Compilation database (compile_commands.json) may contain obsolete items

@@ -764,10 +764,12 @@
 
   # For the full JDK compile commands, create all possible generated sources
   $(foreach m, $(GENSRC_MODULES), $(eval $m-libs-compile-commands: $m-gensrc))
   $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs-compile-commands: $m-java))
 
+  $(COMPILE_COMMANDS_TARGETS_HOTSPOT): clean-compile-commands
+  $(COMPILE_COMMANDS_TARGETS_JDK): clean-compile-commands
   compile-commands-hotspot: $(COMPILE_COMMANDS_TARGETS_HOTSPOT)
   compile-commands: $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JDK)
 
   # Jmods cannot be created until we have the jmod tool ready to run. During
   # a normal build we run it from the exploded image, but when cross compiling

@@ -1137,10 +1139,13 @@
         $(ECHO) Cleaned all build artifacts.
 
 clean-docs:
         $(call CleanDocs)
 
+clean-compile-commands:
+        $(call CleanMakeSupportDir,compile-commands)
+
 $(CLEAN_DIR_TARGETS):
         $(call CleanDir,$(patsubst clean-%, %, $@))
 
 $(CLEAN_SUPPORT_DIR_TARGETS):
         $(call CleanSupportDir,$(patsubst clean-%, %, $@))

@@ -1179,13 +1184,13 @@
                 && $(RM) -r $(OUTPUTDIR)) \
           fi \
         )
         $(ECHO) Cleaned everything, you will have to re-run configure.
 
-ALL_TARGETS += clean clean-docs dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_SUPPORT_DIR_TARGETS) \
-    $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) $(CLEAN_MODULE_TARGETS) \
-    $(CLEAN_MODULE_PHASE_TARGETS)
+ALL_TARGETS += clean clean-docs clean-compile-commands dist-clean $(CLEAN_DIR_TARGETS) \
+    $(CLEAN_SUPPORT_DIR_TARGETS) $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) \
+    $(CLEAN_MODULE_TARGETS) $(CLEAN_MODULE_PHASE_TARGETS)
 
 ################################################################################
 # Declare *-only targets for each normal target
 $(foreach t, $(ALL_TARGETS), $(eval $(t)-only: $(t)))