diff --git a/rust/Cargo.lock.in b/rust/Cargo.lock.in index b1ed92b890..e26389fde0 100644 --- a/rust/Cargo.lock.in +++ b/rust/Cargo.lock.in @@ -1048,9 +1048,9 @@ dependencies = [ [[package]] name = "suricata-lua-sys" -version = "0.1.0-alpha.3" +version = "0.1.0-alpha.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed3f46aa1b92feb15880f722bbce121e769bda1770f0090121cd6c920d89450" +checksum = "2db6abfb8d28b60a0d984272123ed1bec6c45a5f729f6393921482007406babf" dependencies = [ "fs_extra", ] diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in index aa734476df..e7141e17a9 100644 --- a/rust/Cargo.toml.in +++ b/rust/Cargo.toml.in @@ -69,7 +69,7 @@ time = "~0.3.36" suricata-derive = { path = "./derive", version = "@PACKAGE_VERSION@" } -suricata-lua-sys = { version = "0.1.0-alpha.3" } +suricata-lua-sys = { version = "0.1.0-alpha.5" } [dev-dependencies] test-case = "~3.3.1" diff --git a/rust/Makefile.am b/rust/Makefile.am index be80a806f1..d53eb97090 100644 --- a/rust/Makefile.am +++ b/rust/Makefile.am @@ -34,23 +34,24 @@ if RUST_CROSS_COMPILE RUST_TARGET = --target $(host_triplet) endif -all-local: Cargo.toml - mkdir -p $(abs_top_builddir)/rust/gen if HAVE_CYGPATH - cd $(abs_top_srcdir)/rust && \ - @rustup_home@ CARGO_HOME="$(CARGO_HOME)" \ +CARGO_ENV = @rustup_home@ \ + CARGO_HOME="$(CARGO_HOME)" \ CARGO_TARGET_DIR="$(e_rustdir)/target" \ - SURICATA_LUA_SYS_HEADER_DST="$(e_rustdir)/gen" \ - $(CARGO) build $(RELEASE) \ - --features "$(RUST_FEATURES)" $(RUST_TARGET) + SURICATA_LUA_SYS_HEADER_DST="$(e_rustdir)/gen" else - cd $(abs_top_srcdir)/rust && \ - @rustup_home@ CARGO_HOME="$(CARGO_HOME)" \ +CARGO_ENV = @rustup_home@ \ + CARGO_HOME="$(CARGO_HOME)" \ CARGO_TARGET_DIR="$(abs_top_builddir)/rust/target" \ - SURICATA_LUA_SYS_HEADER_DST="$(abs_top_builddir)/rust/gen" \ + SURICATA_LUA_SYS_HEADER_DST="$(abs_top_builddir)/rust/gen" +endif + +all-local: Cargo.toml + mkdir -p $(abs_top_builddir)/rust/gen + cd $(abs_top_srcdir)/rust && \ + $(CARGO_ENV) \ $(CARGO) build $(RELEASE) $(NIGHTLY_ARGS) \ --features "$(RUST_FEATURES)" $(RUST_TARGET) -endif if test -e $(RUST_SURICATA_LIBDIR)/suricata.lib; then \ cp -a $(RUST_SURICATA_LIBDIR)/suricata.lib \ $(RUST_SURICATA_LIBDIR)/${RUST_SURICATA_LIBNAME}; \ @@ -76,12 +77,11 @@ distclean-local: check: cd $(abs_top_srcdir)/rust && \ - CARGO_HOME="$(CARGO_HOME)" @rustup_home@ \ - CARGO_TARGET_DIR="$(abs_top_builddir)/rust/target" \ + $(CARGO_ENV) \ $(CARGO) test --all $(RELEASE) --features "$(RUST_FEATURES)" vendor: - CARGO_HOME="$(CARGO_HOME)" @rustup_home@ $(CARGO) vendor + $(CARGO_ENV) $(CARGO) vendor if HAVE_CBINDGEN gen/rust-bindings.h: $(RUST_SURICATA_LIB)