From bccb9f794c85710330a129be8bb05126dee09127 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Fri, 12 Oct 2018 18:31:45 -0400
Subject: [PATCH] Fix Windows .exe not found, bug1361.

---
 Changes                | 2 ++
 bin/verilator          | 6 ++++--
 bin/verilator_coverage | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Changes b/Changes
index 3f659c717..e25ce8f72 100644
--- a/Changes
+++ b/Changes
@@ -12,6 +12,8 @@ The contributors that suggested a given feature are shown in []. Thanks!
 
 ****  Fix --trace-lxt2 compile error on MinGW, msg2667. [HyungKi Jeong]
 
+****  Fix Windows .exe not found, bug1361. [Patrick Stewart]
+
 
 * Verilator 4.004 2018-10-6
 
diff --git a/bin/verilator b/bin/verilator
index ffd5ac495..25da8cd5e 100755
--- a/bin/verilator
+++ b/bin/verilator
@@ -134,13 +134,15 @@ sub verilator_bin {
                     || ($Debug ? "verilator_bin_dbg" : "verilator_bin"));
     if (defined($ENV{VERILATOR_ROOT})) {
         my $dir = $ENV{VERILATOR_ROOT};
-        if (-x "$dir/bin/$basename") {  # From a "make install" into VERILATOR_ROOT
+        if (-x "$dir/bin/$basename"
+            || -x "$dir/bin/$basename.exe") {  # From a "make install" into VERILATOR_ROOT
             $bin = "$dir/bin/$basename";
         } else {
             $bin = "$dir/$basename";  # From pointing to kit directory
         }
     } else {
-        if (-x "$RealBin/$basename") {
+        if (-x "$RealBin/$basename"
+            || -x "$RealBin/$basename.exe") {
             $bin = "$RealBin/$basename";  # From path/to/verilator with verilator_bin installed
         } else {
             $bin = $basename;  # Find in PATH
diff --git a/bin/verilator_coverage b/bin/verilator_coverage
index 2e1a05e17..4263827dc 100755
--- a/bin/verilator_coverage
+++ b/bin/verilator_coverage
@@ -93,13 +93,15 @@ sub verilator_coverage_bin {
 		    || "verilator_coverage_bin_dbg");
     if (defined($ENV{VERILATOR_ROOT})) {
 	my $dir = $ENV{VERILATOR_ROOT};
-	if (-x "$dir/bin/$basename") {  # From a "make install" into VERILATOR_ROOT
+        if (-x "$dir/bin/$basename"
+            || -x "$dir/bin/$basename.exe") {  # From a "make install" into VERILATOR_ROOT
 	    $bin = "$dir/bin/$basename";
 	} else {
 	    $bin = "$dir/$basename";  # From pointing to kit directory
 	}
     } else {
-	if (-x "$RealBin/$basename") {
+        if (-x "$RealBin/$basename"
+            || -x "$RealBin/$basename.exe") {
 	    $bin = "$RealBin/$basename";  # From path/to/verilator with verilator_bin installed
 	} else {
 	    $bin = $basename;  # Find in PATH