Fix Bug #776 -
"vlnggen fails to find verilator in MSYS2/MINGW64 on Windows 10". Patch by Chaojun.
This commit is contained in:
parent
55dc72a01f
commit
0f693a55d0
|
|
@ -36,16 +36,23 @@ else
|
||||||
setcs cflags="--CFLAGS -fpic" // For g++
|
setcs cflags="--CFLAGS -fpic" // For g++
|
||||||
end
|
end
|
||||||
|
|
||||||
if $oscompiled = 2 | $oscompiled = 3 | $oscompiled = 8 // Windows
|
if $oscompiled = 1 | $oscompiled = 2 | $oscompiled = 8 // Windows (MINGW, Cygwin, MSVC)
|
||||||
set windows=1
|
set windows=1
|
||||||
set dirsep1="\\"
|
set dirsep1="\\"
|
||||||
set dirsep2="/"
|
set dirsep2="/"
|
||||||
|
if $oscompiled = 1 // MINGW: verilator is a Perl wrapper, needs MSYS2 shell
|
||||||
|
set run_verilator="sh -c \"verilator"
|
||||||
|
set run_verilator_close="\""
|
||||||
|
else
|
||||||
set vloc="C:/mingw64/bin/verilator" // Expected location on Windows
|
set vloc="C:/mingw64/bin/verilator" // Expected location on Windows
|
||||||
set run_verilator="perl $vloc" // Verilator is a Perl script
|
set run_verilator="perl $vloc" // Verilator is a Perl script
|
||||||
|
set run_verilator_close=""
|
||||||
|
end
|
||||||
else
|
else
|
||||||
set windows=0
|
set windows=0
|
||||||
set dirsep1="/"
|
set dirsep1="/"
|
||||||
set run_verilator=verilator
|
set run_verilator=verilator
|
||||||
|
set run_verilator_close=""
|
||||||
end
|
end
|
||||||
|
|
||||||
if $oscompiled = 7 // MacOS
|
if $oscompiled = 7 // MacOS
|
||||||
|
|
@ -139,7 +146,7 @@ setcs prefix="Vlng"
|
||||||
|
|
||||||
// Run Verilator on the given input files.
|
// Run Verilator on the given input files.
|
||||||
|
|
||||||
shell $run_verilator --Mdir $objdir --prefix $prefix $cflags --cc $argv
|
shell $run_verilator --Mdir $objdir --prefix $prefix $cflags --cc $argv$run_verilator_close
|
||||||
if $shellstatus > 0
|
if $shellstatus > 0
|
||||||
quit
|
quit
|
||||||
end
|
end
|
||||||
|
|
@ -304,7 +311,7 @@ end
|
||||||
|
|
||||||
shell $run_verilator --Mdir $objdir --prefix $prefix $include $cflags
|
shell $run_verilator --Mdir $objdir --prefix $prefix $include $cflags
|
||||||
+ --cc --build --exe
|
+ --cc --build --exe
|
||||||
+ $fn_main $fn $argv
|
+ $fn_main $fn $argv$run_verilator_close
|
||||||
|
|
||||||
strcmp bad "$shellstatus" "0"
|
strcmp bad "$shellstatus" "0"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ end
|
||||||
|
|
||||||
set noglob
|
set noglob
|
||||||
|
|
||||||
if $oscompiled = 2 | $oscompiled = 3 | $oscompiled = 8 // Windows
|
if $oscompiled = 1 | $oscompiled = 2 | $oscompiled = 8 // Windows (MINGW, Cygwin, MSVC)
|
||||||
set windows=1
|
set windows=1
|
||||||
set dirsep1="\\"
|
set dirsep1="\\"
|
||||||
set dirsep2="/"
|
set dirsep2="/"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue