1 files changed, 12 insertions, 1 deletions

diff --git a/src/lib/libcrypto/util/selftest.pl b/src/lib/libcrypto/util/selftest.pl
index 04b4425d7e..eb50d52ff8 100644
--- a/src/lib/libcrypto/util/selftest.pl
+++ b/src/lib/libcrypto/util/selftest.pl
@@ -19,6 +19,7 @@ my $ok=0;
 my $cc="cc";
 my $cversion="??";
 my $sep="-----------------------------------------------------------------------------\n";
+my $not_our_fault="\nPlease ask your system administrator/vendor for more information.\n[Problems with your operating system setup should not be reported\nto the OpenSSL project.]\n";
 
 open(OUT,">$report") or die;
 
@@ -76,16 +77,18 @@ print OUT "\n";
 
 print "Checking compiler...\n";
 if (open(TEST,">cctest.c")) {
-    print TEST "#include <stdio.h>\nmain(){printf(\"Hello world\\n\");}\n";
+    print TEST "#include <stdio.h>\n#include <errno.h>\nmain(){printf(\"Hello world\\n\");}\n";
     close(TEST);
     system("$cc -o cctest cctest.c");
     if (`./cctest` !~ /Hello world/) {
         print OUT "Compiler doesn't work.\n";
+        print OUT $not_our_fault;
         goto err;
     }
     system("ar r cctest.a /dev/null");
     if (not -f "cctest.a") {
         print OUT "Check your archive tool (ar).\n";
+        print OUT $not_our_fault;
         goto err;
     }
 } else {
@@ -102,6 +105,7 @@ if (open(TEST,">cctest.c")) {
         } else {
             print OUT "Can't compile test program!\n";
         }
+        print OUT $not_our_fault;
         goto err;
     }
 } else {
@@ -133,6 +137,13 @@ if (/no-/)
     goto err;
 }
 
+if (`echo 4+1 | bc` != 5)
+{
+    print OUT "Can't run bc! Test skipped.\n";
+    print OUT $not_our_fault;
+    goto err;
+}
+
 print "Running make test...\n";
 if (system("make test 2>&1 | tee maketest.log") > 255)
  {