Skip to content

Commit 1013b41

Browse files
fetch_cargo_deps.py: ensure CARGO_HOME is used (#1804)
This PR ensures that CARGO_HOME is used (rather than the default of ~/.cargo) when fetching cargo deps, and also gets rid of the llnl.* deprecation warning for fetch_cargo_deps.py.
1 parent 50ee42e commit 1013b41

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

‎util/fetch_cargo_deps.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from spack_repo.builtin.build_systems.python import PythonPackage
2626
from spack.package_base import PackageBase
2727
from spack.util.executable import Executable, which
28-
from llnl.util.filesystem import working_dir
28+
from spack.llnl.util.filesystem import working_dir
2929
from spack.store import find
3030
from spack.util.environment import EnvironmentModifications
3131
from spack.error import SpackError
@@ -117,6 +117,7 @@
117117
cargo_exe = Executable(cargo_wrapper)
118118

119119
env = EnvironmentModifications()
120+
env.set("CARGO_HOME", cargo_home)
120121
if cargo_bin:
121122
env.prepend_path("PATH", cargo_bin)
122123
for root, dirs, files in os.walk(pkg.stage.source_path):

0 commit comments

Comments
 (0)