[config] silence failing auto::inline probes

Use run_cc_capture and actually check the result. Fixes GH #1118.
parrot · Nov 4, 2014 · 19b0898 · 19b0898
1 parent 4d22d87
commit 19b0898
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -8,6 +8,7 @@
         + Add --{en,dis}able-static #1104
         + Fix Windows build for pbc_to_exe #1114
         + Fix default cygwin builds #1116
+        + Silence failing auto::inline probe #1118
     - Documentation
         + Document .lex "name" limitations. Use .lex 'name' w/ single-quotes #1095
     - Tests

diff --git a/config/auto/inline.pm b/config/auto/inline.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2009, Parrot Foundation.
+# Copyright (C) 2001-2014, Parrot Foundation.
 
 =head1 NAME
 
@@ -53,11 +53,11 @@ sub _first_probe_for_inline {
     $conf->cc_gen('config/auto/inline/test1_c.in');
     eval { $conf->cc_build(); };
     if ( !$@ ) {
-        $test = $conf->cc_run();
+        $test = $conf->cc_run_capture();
         chomp $test if $test;
     }
     $conf->cc_clean();
-    return $test;
+    return $test eq "inline";
 }
 
 sub _second_probe_for_inline {
@@ -68,12 +68,12 @@ sub _second_probe_for_inline {
         $conf->cc_gen('config/auto/inline/test2_c.in');
         eval { $conf->cc_build(); };
         if ( !$@ ) {
-            $test = $conf->cc_run();
+            $test = $conf->cc_run_capture();
             chomp $test if $test;
         }
         $conf->cc_clean();
     }
-    return $test;
+    return $test eq "__inline";
 }
 
 sub _evaluate_inline {