From dfbcaf8482a7355743e9421b5c59f7266e01d8d6 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Wed, 13 Sep 2023 15:47:50 +0200 Subject: [PATCH] Add make -C rust clean when generate.py is run. See comment for motivation. While working on the settings project, I had this line, but I thouhgt it was no longer needed so I removed it. It turns out it *is* needed. Found out when adding the recursor.tcp_threads field. --- pdns/recursordist/settings/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pdns/recursordist/settings/Makefile.am b/pdns/recursordist/settings/Makefile.am index 6e5952c958..536dc712e7 100644 --- a/pdns/recursordist/settings/Makefile.am +++ b/pdns/recursordist/settings/Makefile.am @@ -12,8 +12,12 @@ all: cxxsettings-generated.cc BUILT_SOURCES=cxxsettings-generated.cc -# It's a bit dirty that this target also generated a file inside rust/src (lib.rs) +# It's a bit dirty that this target also generates a file inside rust/src (lib.rs). Also, we need to +# clean in the Rust dir, as in some cases the Serde/CXX derive/generate code does not get re-run by +# cargo after rust/src/lib.rs changed because of a generate.py run. In that case we end up with an +# rust/src/lib.rs.h that does not contain e.g. field name or field type changes. cxxsettings-generated.cc: table.py generate.py rust-preamble-in.rs rust-bridge-in.rs docs-old-preamble-in.rst docs-new-preamble-in.rst + $(MAKE) -C rust clean $(PYTHON) generate.py clean-local: -- 2.47.2