Skip to content

chore: restrict Android cfg too 64-bit to match linux_execfn #12416

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

Open
YumeYuka wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −2
Open

chore: restrict Android cfg too 64-bit to match linux_execfn #12416

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
10 changes: 8 additions & 2 deletions src/common/validation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ fn get_canonical_util_name(util_name: &str) -> &str {
/// Gets the binary path from command line arguments
/// Panics if the binary path cannot be determined
#[cfg(any(
not(any(target_os = "linux", target_os = "android")),
not(any(
target_os = "linux",
all(target_os = "android", target_pointer_width = "64")
)),
target_env = "musl"
))]
pub fn binary_path(args: &mut impl Iterator<Item = OsString>) -> PathBuf {
Expand All @@ -88,7 +91,10 @@ pub fn binary_path(args: &mut impl Iterator<Item = OsString>) -> PathBuf {
/// Get actual binary path from kernel, not argv0, to prevent `env -a` from bypassing
/// AppArmor, SELinux policies on hard-linked binaries
#[cfg(all(
any(target_os = "linux", target_os = "android"),
any(
target_os = "linux",
all(target_os = "android", target_pointer_width = "64")
),
not(target_env = "musl")
))]
pub fn binary_path(args: &mut impl Iterator<Item = OsString>) -> PathBuf {
Expand Down
Loading