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

Update rustup-init.sh for 32bit powerpc userland #1587

Merged
merged 1 commit into from
Dec 26, 2018
Merged

Update rustup-init.sh for 32bit powerpc userland #1587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion rustup-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,20 @@ get_architecture() {

esac

# Detect 64-bit linux with 32-bit userland
# Detect 64-bit linux with 32-bit userland for x86
if [ $_ostype = unknown-linux-gnu -a $_cputype = x86_64 ]; then
if [ "$(get_bitness)" = "32" ]; then
local _cputype=i686
fi
fi

# Detect 64-bit linux with 32-bit userland for powerpc
if [ $_ostype = unknown-linux-gnu -a $_cputype = powerpc64 ]; then
if [ "$(get_bitness)" = "32" ]; then
local _cputype=powerpc
fi
fi

# Detect armv7 but without the CPU features Rust needs in that build,
# and fall back to arm.
# See https://github.com/rust-lang/rustup.rs/issues/587.
Expand Down