Fixed cross-suffix detection for path that contains dashes when the compiler itself...
authorbuffer51 <paul.mustiere@gmail.com>
Wed, 27 Apr 2016 19:09:44 +0000 (12:09 -0700)
committerbuffer51 <paul.mustiere@gmail.com>
Wed, 27 Apr 2016 19:09:44 +0000 (12:09 -0700)
c_check

diff --git a/c_check b/c_check
index bcf4c2c..5242e33 100644 (file)
--- 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 = "";