From d92e08ee72e6008678a80722b3f0c714e6b91fd6 Mon Sep 17 00:00:00 2001 From: eycorsican Date: Fri, 12 May 2023 09:23:46 +0330 Subject: [PATCH] Sets RANLIB for Android only if using GCC --- src/lib.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index a948244d..1ddab2ac 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -358,11 +358,16 @@ impl Build { ar.get_args().collect::>().join(OsStr::new(" ")), ); } - let ranlib = cc.get_ranlib(); - // OpenSSL does not support RANLIBFLAGS. Jam the flags in RANLIB. - let mut args = vec![ranlib.get_program()]; - args.extend(ranlib.get_args()); - configure.env("RANLIB", args.join(OsStr::new(" "))); + + // We don't have GCC in newer NDK versions. + if !target.contains("android") || (target.contains("android") && path.contains("-gcc")) + { + let ranlib = cc.get_ranlib(); + // OpenSSL does not support RANLIBFLAGS. Jam the flags in RANLIB. + let mut args = vec![ranlib.get_program()]; + args.extend(ranlib.get_args()); + configure.env("RANLIB", args.join(OsStr::new(" "))); + } // Make sure we pass extra flags like `-ffunction-sections` and // other things like ARM codegen flags.