From 42759e401196af4961f412d8d85fa7e6d658bc37 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Tue, 12 Feb 2019 18:20:40 -0500
Subject: [PATCH] Fix VERILATOR_GDB being ignored, msg2860.

---
 Changes                | 2 ++
 bin/verilator          | 2 +-
 test_regress/driver.pl | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index f56dd042e..fa39566b9 100644
--- a/Changes
+++ b/Changes
@@ -6,6 +6,8 @@ The contributors that suggested a given feature are shown in []. Thanks!
 
 ***   Add +verilator+seed, bug1396. [Stan Sokorac]
 
+****  Fix VERILATOR_GDB being ignored, msg2860. [Yu Sheng Lin]
+
 
 * Verilator 4.010 2019-01-27
 
diff --git a/bin/verilator b/bin/verilator
index bceba8bd2..4db8ec91a 100755
--- a/bin/verilator
+++ b/bin/verilator
@@ -85,7 +85,7 @@ if ($opt_gdbbt && !gdb_works()) {
 my @quoted_sw = map {sh_escape($_)} @Opt_Verilator_Sw;
 if ($opt_gdb) {
     # Generic GDB interactive
-    run (("gdb"||$ENV{VERILATOR_GDB})
+    run (($ENV{VERILATOR_GDB}||"gdb")
          ." ".verilator_bin()
          # Note, uncomment to set breakpoints before running:
          #  ." -ex 'break main'"
diff --git a/test_regress/driver.pl b/test_regress/driver.pl
index d5efd6a76..7de2310e8 100755
--- a/test_regress/driver.pl
+++ b/test_regress/driver.pl
@@ -900,7 +900,7 @@ sub execute {
 	$param{executable} ||= "$self->{obj_dir}/$param{VM_PREFIX}";
 	$self->_run(logfile=>"$self->{obj_dir}/vlt_sim.log",
 		    cmd=>[($run_env
-			   .($opt_gdbsim ? ("gdb"||$ENV{VERILATOR_GDB})." " : "")
+			   .($opt_gdbsim ? ($ENV{VERILATOR_GDB}||"gdb")." " : "")
 			   .$param{executable}
 			   .($opt_gdbsim ? " -ex 'run " : "")),
 			  @{$param{all_run_flags}},