rust: fix vendor use on MinGW

pull/4490/head
Victor Julien 5 years ago committed by Jason Ish
parent 57b683233d
commit ce0ae81d95

@ -85,7 +85,7 @@
AC_PROG_GREP AC_PROG_GREP
AC_PATH_PROG(HAVE_CYGPATH, cygpath, "no") AC_PATH_PROG(HAVE_CYGPATH, cygpath, "no")
AM_CONDITIONAL([HAVE_CYGPATH], [test "x$enable_cygpath" = "xyes"]) AM_CONDITIONAL([HAVE_CYGPATH], [test "x$HAVE_CYGPATH" != "xno"])
AC_PATH_PROG(HAVE_PKG_CONFIG, pkg-config, "no") AC_PATH_PROG(HAVE_PKG_CONFIG, pkg-config, "no")
if test "$HAVE_PKG_CONFIG" = "no"; then if test "$HAVE_PKG_CONFIG" = "no"; then
@ -2415,7 +2415,12 @@ fi
AC_SUBST(RUST_SURICATA_LIB) AC_SUBST(RUST_SURICATA_LIB)
AC_SUBST(RUST_LDADD) AC_SUBST(RUST_LDADD)
if test "x$CARGO_HOME" = "x"; then if test "x$CARGO_HOME" = "x"; then
if test "x$HAVE_CYGPATH" != "no"; then
CYGPATH_CARGO_HOME=$(cygpath -a -t mixed ~/.cargo)
AC_SUBST([CARGO_HOME], [$CYGPATH_CARGO_HOME])
else
AC_SUBST([CARGO_HOME], [~/.cargo]) AC_SUBST([CARGO_HOME], [~/.cargo])
fi
else else
AC_SUBST([CARGO_HOME], [$CARGO_HOME]) AC_SUBST([CARGO_HOME], [$CARGO_HOME])
fi fi

@ -5,4 +5,4 @@
@rust_vendor_comment@replace-with = 'vendored-sources' @rust_vendor_comment@replace-with = 'vendored-sources'
@rust_vendor_comment@ @rust_vendor_comment@
@rust_vendor_comment@[source.vendored-sources] @rust_vendor_comment@[source.vendored-sources]
@rust_vendor_comment@directory = '@abs_top_srcdir@/rust/vendor' @rust_vendor_comment@directory = '@e_rustdir@/vendor'

@ -27,10 +27,9 @@ if HAVE_PYTHON
cd $(top_srcdir)/rust && $(HAVE_PYTHON) ./gen-c-headers.py cd $(top_srcdir)/rust && $(HAVE_PYTHON) ./gen-c-headers.py
endif endif
if HAVE_CYGPATH if HAVE_CYGPATH
rustpath=`cygpath -a -t mixed $(abs_top_builddir)`
@rustup_home@ \ @rustup_home@ \
CARGO_HOME="$(CARGO_HOME)" \ CARGO_HOME="$(CARGO_HOME)" \
CARGO_TARGET_DIR="$$rustpath/rust/target" \ CARGO_TARGET_DIR="$(e_rustdir)/target" \
$(CARGO) build $(RELEASE) \ $(CARGO) build $(RELEASE) \
--features "$(RUST_FEATURES)" $(RUST_TARGET) --features "$(RUST_FEATURES)" $(RUST_TARGET)
else else

Loading…
Cancel
Save