From 20b0ed1da598a98b2b5036bc0decbd4aae79aa20 Mon Sep 17 00:00:00 2001
From: buffer51 <paul.mustiere@gmail.com>
Date: Wed, 27 Apr 2016 12:09:44 -0700
Subject: [PATCH 1/2] Fixed cross-suffix detection for path that contains
 dashes when the compiler itself doesn't

---
 c_check | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/c_check b/c_check
index bcf4c2cb3..5242e33a9 100644
--- a/c_check
+++ b/c_check
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+use File::Basename;
+
 # Checking cross compile
 $hostos   = `uname -s | sed -e s/\-.*//`;    chop($hostos);
 $hostarch = `uname -m | sed -e s/i.86/x86/`;chop($hostarch);
@@ -26,14 +28,12 @@ if ($?) {
 
 $cross_suffix = "";
 
-if ($ARGV[0] =~ /(.*)(-[.\d]+)/) {
-    if ($1 =~ /(.*-)(.*)/) {
-	$cross_suffix = $1;
-    }
-} else {
-    if ($ARGV[0] =~ /([^\/]*-)([^\/]*$)/) {
-	$cross_suffix = $1;
-    }
+if (dirname($compiler_name) ne ".") {
+    $cross_suffix .= dirname($compiler_name) . "/";
+}
+
+if (basename($compiler_name) =~ /(.*-)(.*)/) {
+    $cross_suffix .= $1;
 }
 
 $compiler = "";

From 708dec5bb7fc2b1244934e585fd5e57ccbd66722 Mon Sep 17 00:00:00 2001
From: buffer51 <paul.mustiere@gmail.com>
Date: Wed, 27 Apr 2016 22:23:02 -0700
Subject: [PATCH 2/2] Use CROSS_SUFFIX only if CROSS is set

---
 c_check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c_check b/c_check
index 5242e33a9..3a5601b1d 100644
--- a/c_check
+++ b/c_check
@@ -243,7 +243,7 @@ print MAKEFILE "BINARY64=\n" if $binformat ne bin64;
 print MAKEFILE "BINARY32=1\n" if $binformat eq bin32;
 print MAKEFILE "BINARY64=1\n" if $binformat eq bin64;
 print MAKEFILE "FU=$need_fu\n" if $need_fu ne "";
-print MAKEFILE "CROSS_SUFFIX=$cross_suffix\n" if $cross_suffix ne "";
+print MAKEFILE "CROSS_SUFFIX=$cross_suffix\n" if $cross != 0 && $cross_suffix ne "";
 print MAKEFILE "CROSS=1\n" if $cross != 0;
 print MAKEFILE "CEXTRALIB=$linker_L $linker_l $linker_a\n";