From ef46dc1d78511e319bc06966c1ac36e935bf50d2 Mon Sep 17 00:00:00 2001 From: Bas Zalmstra Date: Sun, 14 Jul 2024 23:01:50 +0200 Subject: [PATCH] detector --- .github/workflows/glibc-detectors.yml | 2 +- ...etector-ppcle64 => linux-glibc-detector-ppc64le} | Bin src/lib.rs | 2 +- src/main.rs | 3 +++ 4 files changed, 5 insertions(+), 2 deletions(-) rename linux-glibc-detectors/bin/{linux-glibc-detector-ppcle64 => linux-glibc-detector-ppc64le} (100%) create mode 100644 src/main.rs diff --git a/.github/workflows/glibc-detectors.yml b/.github/workflows/glibc-detectors.yml index 3d20ed7..26fec6e 100644 --- a/.github/workflows/glibc-detectors.yml +++ b/.github/workflows/glibc-detectors.yml @@ -32,7 +32,7 @@ jobs: - { name: aarch64, target: aarch64-unknown-linux-gnu } - { name: armv7l, target: arm-unknown-linux-gnueabi } - { name: ppc64, target: powerpc64-unknown-linux-gnu } - - { name: ppcle64, target: powerpc64le-unknown-linux-gnu } + - { name: ppc64le, target: powerpc64le-unknown-linux-gnu } # - { name: s390x, target: s390x-unknown-linux-gnu } steps: - name: Checkout source code diff --git a/linux-glibc-detectors/bin/linux-glibc-detector-ppcle64 b/linux-glibc-detectors/bin/linux-glibc-detector-ppc64le similarity index 100% rename from linux-glibc-detectors/bin/linux-glibc-detector-ppcle64 rename to linux-glibc-detectors/bin/linux-glibc-detector-ppc64le diff --git a/src/lib.rs b/src/lib.rs index 41ddad1..fd7d1a8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -121,7 +121,7 @@ pub fn glibc_version() -> Option<(u32, u32)> { /// Detect the current version of `musl` `libc` by inspecting the `/lib/ld-musl-*.so.1` loaders. pub fn musl_libc_version() -> Option<(u32, u32)> { - for arch in ["x86_64", "aarch64", "i386", "armhf", "powerpc64le", "s390x"] { + for arch in ["x86_64", "aarch64", "i386", "armhf", "arm", "powerpc64le", "s390x"] { let loader = PathBuf::from(format!("/lib/ld-musl-{arch}.so.1")); if !loader.exists() { continue; diff --git a/src/main.rs b/src/main.rs new file mode 100644 index 0000000..9e1dcb9 --- /dev/null +++ b/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("{:?}", libc_detector::libc_version()); +} \ No newline at end of file