Skip to content

Commit b9a3590

Browse files
committed
llvm: allow cleaning LLVM's Visual Studio builds
The Visual Studio generators create a `clean` target that we can use.
1 parent 1bcd606 commit b9a3590

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

mk/llvm.mk

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ clean-llvm$(1):
5959
$$(Q)$$(CFG_NINJA) -C $$(CFG_LLVM_BUILD_DIR_$(1)) -t clean
6060
else ifeq ($$(findstring msvc,$(1)),msvc)
6161
clean-llvm$(1):
62+
@$$(call E, clean: llvm)
63+
$$(Q)$$(CFG_CMAKE) --build $$(CFG_LLVM_BUILD_DIR_$(1)) \
64+
--config $$(LLVM_BUILD_CONFIG_MODE) \
65+
--target clean
6266
else
6367
clean-llvm$(1):
6468
@$$(call E, clean: llvm)

mk/rt.mk

+7
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,17 @@ $$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS) $$(LLVM_CONFIG_$$(CFG_BUILD
350350
$$(COMPRT_DEFINES_$(1)) \
351351
$$(COMPRT_BUILD_CC_$(1)) \
352352
-G"$$(CFG_CMAKE_GENERATOR)"
353+
ifneq ($$(CFG_NINJA),)
354+
$$(CFG_CMAKE) --build "$$(COMPRT_BUILD_DIR_$(1))" \
355+
--target $$(COMPRT_BUILD_TARGET_$(1)) \
356+
--config $$(LLVM_BUILD_CONFIG_MODE) \
357+
-- $$(COMPRT_BUILD_ARGS_$(1))
358+
else
353359
$$(Q)$$(CFG_CMAKE) --build "$$(COMPRT_BUILD_DIR_$(1))" \
354360
--target $$(COMPRT_BUILD_TARGET_$(1)) \
355361
--config $$(LLVM_BUILD_CONFIG_MODE) \
356362
-- $$(COMPRT_BUILD_ARGS_$(1)) $$(MFLAGS)
363+
endif
357364
$$(Q)cp "$$(COMPRT_OUTPUT_$(1))" $$@
358365

359366
endif

0 commit comments

Comments
 (0)