Skip to content

Commit

Permalink
Force CMake targets in top-level Makefile to run (apache#8840)
Browse files Browse the repository at this point in the history
This is a bug I introduced in apache#8809, because the built binary is now named `build/cpptest` when `make` checks that artifact it finds it exists already and skips running `make -C build cpptest`. This ensures all nested `make` calls are forced to run from the top-level `Makefile`.
  • Loading branch information
Mousius authored and ylc committed Sep 29, 2021
1 parent 4b35bff commit 636c3aa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ FORCE:
CMAKE_TARGETS = all runtime vta cpptest crttest

define GEN_CMAKE_RULE
%/$(CMAKE_TARGET): %/CMakeCache.txt
%/$(CMAKE_TARGET): %/CMakeCache.txt FORCE
@$$(MAKE) -C $$(@D) $(CMAKE_TARGET)
endef
$(foreach CMAKE_TARGET,$(CMAKE_TARGETS),$(eval $(GEN_CMAKE_RULE)))
Expand Down

0 comments on commit 636c3aa

Please sign in to comment.