llvm: allow cleaning LLVM's Visual Studio builds

The Visual Studio generators create a `clean` target that we can use.

diff --git a/mk/llvm.mk b/mk/llvm.mk
index 602c20430298b8414c9e910a56244fb43ffa7125..d6f812049e03cad1b0892f5f44153e28685a457e 100644 (file)
--- a/mk/llvm.mk
+++ b/mk/llvm.mk
@@ -59,6 +59,10 @@ clean-llvm$(1):
        $$(Q)$$(CFG_NINJA) -C $$(CFG_LLVM_BUILD_DIR_$(1)) -t clean
 else ifeq ($$(findstring msvc,$(1)),msvc)
 clean-llvm$(1):
+       @$$(call E, clean: llvm)
+       $$(Q)$$(CFG_CMAKE) --build $$(CFG_LLVM_BUILD_DIR_$(1)) \
+               --config $$(LLVM_BUILD_CONFIG_MODE) \
+               --target clean
 else
 clean-llvm$(1):
        @$$(call E, clean: llvm)

diff --git a/mk/rt.mk b/mk/rt.mk
index d0ab3102d7d70d82e4979463d20664fb46d3731b..8113b68380744dcc837ad9ae920c434840a98c1c 100644 (file)
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -350,10 +350,17 @@ $$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS) $$(LLVM_CONFIG_$$(CFG_BUILD
                $$(COMPRT_DEFINES_$(1)) \
                $$(COMPRT_BUILD_CC_$(1)) \
                -G"$$(CFG_CMAKE_GENERATOR)"
+ifneq ($$(CFG_NINJA),)
+       $$(CFG_CMAKE) --build "$$(COMPRT_BUILD_DIR_$(1))" \
+               --target $$(COMPRT_BUILD_TARGET_$(1)) \
+               --config $$(LLVM_BUILD_CONFIG_MODE) \
+               -- $$(COMPRT_BUILD_ARGS_$(1))
+else
        $$(Q)$$(CFG_CMAKE) --build "$$(COMPRT_BUILD_DIR_$(1))" \
                --target $$(COMPRT_BUILD_TARGET_$(1)) \
                --config $$(LLVM_BUILD_CONFIG_MODE) \
                -- $$(COMPRT_BUILD_ARGS_$(1)) $$(MFLAGS)
+endif
        $$(Q)cp "$$(COMPRT_OUTPUT_$(1))" $$@
 
 endif