summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2018-04-21 13:31:38 -0400
committerAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2018-04-29 11:33:26 -0400
commit3175cfd9593c6bcafa82ad5ddaaca42715493e79 (patch)
tree03ecc9678241a0ee88bb4f774f154f6a4cca3777
parent0902ab4b4b7a343c6a352170e998bf6c0d55ba0c (diff)
downloadtor-3175cfd9593c6bcafa82ad5ddaaca42715493e79.tar.xz
tor-3175cfd9593c6bcafa82ad5ddaaca42715493e79.zip
rpath doesn't work that way, LD_LIBRARY_PATH is necessary
-rw-r--r--src/rust/Cargo.toml3
-rw-r--r--src/rust/meson.build2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
index bc4d5ef93..8e258cc76 100644
--- a/src/rust/Cargo.toml
+++ b/src/rust/Cargo.toml
@@ -5,6 +5,3 @@ members = ["tor_util", "protover", "smartlist", "external", "tor_allocate",
[profile.release]
debug = true
panic = "abort"
-
-[profile.test]
-rpath = true
diff --git a/src/rust/meson.build b/src/rust/meson.build
index 75cfdad99..8a32bc80f 100644
--- a/src/rust/meson.build
+++ b/src/rust/meson.build
@@ -17,7 +17,7 @@ endif
cargo_test_env = environment()
cargo_test_env.set('abs_top_builddir', meson.build_root())
-# https://github.com/rust-lang/rust/issues/43031
+# https://github.com/rust-lang/cargo/issues/3366
if host_machine.system() != 'windows' and host_machine.system() != 'cygwin'
ld_library_path_var = 'LD_LIBRARY_PATH'
if host_machine.system() == 'darwin'