Merge branch 'master' into qflow-1.4

RTimothyEdwards · Mar 5, 2021 · 3b6064c · 3b6064c
2 parents 6b6f902 + 67b1dfe
commit 3b6064c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.94
+1.4.95
diff --git a/scripts/yosys.sh b/scripts/yosys.sh
@@ -242,7 +242,8 @@ EOF
 
    # Note:  Remove backslashes and brackets to avoid problems with tcsh
    set yerrors = `eval ${bindir}/yosys -s ${modulename}.ys |& sed -e "/\\/s#\\#/#g" \
-		-e "/\[/s/\[//g" -e "/\]/s/\]//g" | grep ERROR`
+		-e "/\[/s/\[//g" -e "/\]/s/\]//g" | grep ERROR | \
+		sed 's/^.*\(ERROR.*\).*$/\1/'`
    set yerrcnt = `echo $yerrors | wc -c`
 
    if ($yerrcnt > 1) then
@@ -377,7 +378,8 @@ EOF
 
    # Note:  Remove backslashes and brackets to avoid problems with tcsh
    set yerrors = `eval ${bindir}/yosys -s ${modulename}.ys |& sed -e "/\\/s#\\#/#g" \
-		-e "/\[/s/\[//g" -e "/\]/s/\]//g" | grep ERROR`
+		-e "/\[/s/\[//g" -e "/\]/s/\]//g" | grep ERROR | \
+		sed 's/^.*\(ERROR.*\).*$/\1/'`
    set yerrcnt = `echo $yerrors | wc -c`
 
    if ($yerrcnt > 1) then