Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make cargo as relative symlink not absolute #6780

Merged
merged 2 commits into from Nov 16, 2018
Merged

Make cargo as relative symlink not absolute #6780

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91bc05c
Make cargo as relative symlink not absolute
illicitonion Nov 16, 2018
1605499
Python not perl
illicitonion Nov 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion build-support/bin/native/bootstrap_rust.sh
View file
Open in desktop
Expand Up @@ -48,7 +48,8 @@ function bootstrap_rust() {
"${RUSTUP}" toolchain install ${RUST_TOOLCHAIN}
"${RUSTUP}" component add --toolchain ${RUST_TOOLCHAIN} ${RUST_COMPONENTS[@]} >&2

ln -fs "$(RUSTUP_TOOLCHAIN="${RUST_TOOLCHAIN}" cargo_bin)" "${rust_toolchain_root}/${cargo_versioned}"
symlink_target="$(python -c 'import os, sys; print(os.path.relpath(*sys.argv[1:]))' "$(RUSTUP_TOOLCHAIN="${RUST_TOOLCHAIN}" cargo_bin)" "${rust_toolchain_root}")"
ln -fs "${symlink_target}" "${rust_toolchain_root}/${cargo_versioned}"
fi

local -r symlink_farm_root="${REPO_ROOT}/build-support/bin/native"
Expand Down