From 5f97af47013607521b70cb254a1b581cde2310a0 Mon Sep 17 00:00:00 2001
From: Jeff Waugh <jdub@bethesignal.org>
Date: Thu, 13 Oct 2016 01:02:11 +1100
Subject: [PATCH] CROSS_COMPILE is explicit, use it before fallbacks

---
 src/lib.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 87d5f46..56fa7df 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -710,7 +710,7 @@ impl Config {
                 format!("{}-{}", target, gnu)
             } else if self.get_host() != target {
                 let cross_compile = self.getenv("CROSS_COMPILE");
-                let prefix = match &target[..] {
+                let prefix = cross_compile.as_ref().map(String::as_str).or(match &target[..] {
                     "aarch64-unknown-linux-gnu" => Some("aarch64-linux-gnu"),
                     "arm-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
                     "arm-unknown-linux-gnueabihf"  => Some("arm-linux-gnueabihf"),
@@ -739,8 +739,8 @@ impl Config {
                     "x86_64-rumprun-netbsd" => Some("x86_64-rumprun-netbsd"),
                     "x86_64-unknown-linux-musl" => Some("musl"),
                     "x86_64-unknown-netbsd" => Some("x86_64--netbsd"),
-                    _ => cross_compile.as_ref().map(String::as_str),
-                };
+                    _ => None,
+                });
                 match prefix {
                     Some(prefix) => format!("{}-{}", prefix, gnu),
                     None => default.to_string(),