From d6515621f452557e45e4498d508c6b6c60e7660a Mon Sep 17 00:00:00 2001 From: Chris Hofstaedtler Date: Sat, 12 Jul 2025 15:28:40 +0200 Subject: [PATCH] dnsdist-rust-lib: honor RUSTC_TARGET_ARCH Like for pdns-recursor and also like in the meson build. Necessary as Debian's cargo always puts the output files into target//... --- pdns/dnsdistdist/dnsdist-rust-lib/rust/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/rust/Makefile.am b/pdns/dnsdistdist/dnsdist-rust-lib/rust/Makefile.am index 163d29e3d4..139bc16fba 100644 --- a/pdns/dnsdistdist/dnsdist-rust-lib/rust/Makefile.am +++ b/pdns/dnsdistdist/dnsdist-rust-lib/rust/Makefile.am @@ -11,9 +11,9 @@ all install: libdnsdist_rust.a libdnsdist_rust.a: src/lib.rs src/helpers.rs Cargo.toml Cargo.lock SYSCONFDIR=$(sysconfdir) $(CARGO) build --release $(RUST_TARGET) --target-dir=$(builddir)/target --manifest-path ${srcdir}/Cargo.toml --locked - cp target/release/libdnsdist_rust.a libdnsdist_rust.a - cp target/cxxbridge/dnsdist-rust/src/lib.rs.h lib.rs.h - cp target/cxxbridge/rust/cxx.h cxx.h + cp target/$(RUSTC_TARGET_ARCH)/release/libdnsdist_rust.a libdnsdist_rust.a + cp target/$(RUSTC_TARGET_ARCH)/cxxbridge/dnsdist-rust/src/lib.rs.h lib.rs.h + cp target/$(RUSTC_TARGET_ARCH)/cxxbridge/rust/cxx.h cxx.h clean-local: rm -rf libdnsdist_rust.a lib.rs.h cxx.h target -- 2.47.2