sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename {,TOR_}RUST_DEPENDENCIES

This commit is contained in:
Sebastian Hahn 2017-05-27 17:51:21 +02:00 committed by Nick Mathewson
parent cd606d5ad3
commit acdd349dee
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -418,22 +418,22 @@ if test "x$enable_rust" = "xyes"; then
dnl When we're not allowed to touch the network, we need crate dependencies
dnl locally available.
AC_MSG_CHECKING([rust crate dependencies])
AC_ARG_VAR([RUST_DEPENDENCIES], [path to directory with local crate mirror])
if test "x$RUST_DEPENDENCIES" = "x"; then
RUST_DEPENDENCIES="$srcdir/src/ext/rust/"
AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate mirror])
if test "x$TOR_RUST_DEPENDENCIES" = "x"; then
TOR_RUST_DEPENDENCIES="$srcdir/src/ext/rust/"
NEED_MOD=1
fi
if test ! -d "$RUST_DEPENDENCIES"; then
AC_MSG_ERROR([Rust dependency directory $RUST_DEPENDENCIES does not exist. Specify a dependency directory using the RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.])
if test ! -d "$TOR_RUST_DEPENDENCIES"; then
AC_MSG_ERROR([Rust dependency directory $TOR_RUST_DEPENDENCIES does not exist. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.])
fi
for dep in $rust_crates; do
if test ! -d "$RUST_DEPENDENCIES"/"$dep"; then
AC_MSG_ERROR([Failure to find rust dependency $RUST_DEPENDENCIES/$dep. Specify a dependency directory using the RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.])
if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then
AC_MSG_ERROR([Failure to find rust dependency $TOR_RUST_DEPENDENCIES/$dep. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.])
fi
done
if test "x$NEED_MOD" = "x1"; then
dnl When looking for dependencies from cargo, pick right directory
RUST_DEPENDENCIES="../../src/ext/rust"
TOR_RUST_DEPENDENCIES="../../src/ext/rust"
fi
fi

2
src/rust/.cargo/config.in
View File

@ -5,4 +5,4 @@
@RUST_DL@ replace-with = 'vendored-sources'
@RUST_DL@ [source.vendored-sources]
@RUST_DL@ directory = '@RUST_DEPENDENCIES@'
@RUST_DL@ directory = '@TOR_RUST_DEPENDENCIES@'