From 172a1da1c7b99ea085b8ffe2111efb46231a433a Mon Sep 17 00:00:00 2001
From: Jon Gjengset <jongje@amazon.com>
Date: Wed, 1 Feb 2023 07:41:41 -0800
Subject: [PATCH] Use cc for ar/ranlib detection

Note that `Command::get_program` and `Command::get_args` both stabilized
in Rust 1.57.0, and so implicitly bump this crate's MSRV.

Depends on rust-lang/cc-rs#763.

Backport of #173.
---
 Cargo.toml |  2 +-
 src/lib.rs | 31 ++++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d720737b..ce5ad7d3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,4 +39,4 @@ members = ['testcrate']
 exclude = ['target']
 
 [dependencies]
-cc = "1.0"
+cc = "1.0.79"
diff --git a/src/lib.rs b/src/lib.rs
index e457456a..95a4052d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,7 @@
 extern crate cc;
 
 use std::env;
+use std::ffi::OsStr;
 use std::fs;
 use std::path::{Path, PathBuf};
 use std::process::Command;
@@ -323,17 +324,25 @@ impl Build {
             // prefix, we unset `CROSS_COMPILE` for `./Configure`.
             configure.env_remove("CROSS_COMPILE");
 
-            // Infer ar/ranlib tools from cross compilers if the it looks like
-            // we're doing something like `foo-gcc` route that to `foo-ranlib`
-            // as well.
-            if path.ends_with("-gcc") && !target.contains("unknown-linux-musl") {
-                let path = &path[..path.len() - 4];
-                if env::var_os("RANLIB").is_none() {
-                    configure.env("RANLIB", format!("{}-ranlib", path));
-                }
-                if env::var_os("AR").is_none() {
-                    configure.env("AR", format!("{}-ar", path));
-                }
+            let ar = cc.get_archiver();
+            configure.env("AR", ar.get_program());
+            if ar.get_args().count() == 0 {
+                // On some platforms (like emscripten on windows), the ar to use may not be a
+                // single binary, but instead a multi-argument command like `cmd /c emar.bar`.
+                // We can't convey that through `AR` alone, and so also need to set ARFLAGS.
+                configure.env(
+                    "ARFLAGS",
+                    ar.get_args().collect::<Vec<_>>().join(OsStr::new(" ")),
+                );
+            }
+            let ranlib = cc.get_ranlib();
+            configure.env("RANLIB", ranlib.get_program());
+            if ranlib.get_args().count() == 0 {
+                // Same thing as for AR -- we may need to set RANLIBFLAGS
+                configure.env(
+                    "RANLIBFLAGS",
+                    ranlib.get_args().collect::<Vec<_>>().join(OsStr::new(" ")),
+                );
             }
 
             // Make sure we pass extra flags like `-ffunction-sections` and