summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-07-10 14:12:33 +0200
committerRichard Levitte <levitte@openssl.org>2018-07-11 14:49:02 +0200
commit9abce88b4b0055d6238a838aa00360152e185f02 (patch)
tree29f4b8f78fa6f6adf0cf5dd0e87896a07b355fa8 /util
parentc9ecb13191fe902c1e78e3bca7c36c293bba4bc6 (diff)
Windows: fix echo for nmake
It seems that nmake first tries to run executables on its own, and only pass commands to cmd if that fails. That means it's possible to have nmake run something like 'echo.exe' when the builtin 'echo' command was expected, which might give us unexpected results. To get around this, we create our own echoing script and call it explicitly from the nmake makefile. Fixes #6670 Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> (Merged from https://github.com/openssl/openssl/pull/6686)
Diffstat (limited to 'util')
-rw-r--r--util/echo.pl12
1 files changed, 12 insertions, 0 deletions
diff --git a/util/echo.pl b/util/echo.pl
new file mode 100644
index 0000000000..d90e52129b
--- /dev/null
+++ b/util/echo.pl
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+use Getopt::Std;
+
+our $opt_n = 0;
+
+getopts('n') or die "Invalid option: $!\n";
+
+print join(' ', @ARGV);
+print "\n" unless $opt_n;