libgo: don't unset in shell script

    Reportedly ksh fails to unset a variable that was not previously set.
    Change match.sh and gotest to not unset LANG, but instead set LANG=C.
    Also don't combine exporting and setting variable in a single statement.

    Reviewed-on: https://go-review.googlesource.com/26999

From-SVN: r239443

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 00b5cccd80cbce2aa9e1d6b1d63f079e670e28e8..16beba1d84393403b54558b7ce7546819b22529f 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-d51890dc96a2a33484623728bdc8ac258645e9cc
+24e0c4c98e0614b1892316aca787f1c564f2d269
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/match.sh b/libgo/match.sh
index f626112642b8e047283ff1fca35b1b424ba53029..23db19478fa15f008464f6161ad1b9c4cf05881c 100755 (executable)
--- a/libgo/match.sh
+++ b/libgo/match.sh
@@ -10,10 +10,10 @@
 
 set -e
 
-unset LANG
+LANG=C
 LC_ALL=C
 LC_CTYPE=C
-export LC_ALL LC_CTYPE
+export LANG LC_ALL LC_CTYPE
 
 srcdir=""
 goarch=""

diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest
index 5fc888bddecf561e9c589d6a5b0cc3a1b334737d..980e9483a6f589007abc508922bfaf0e99ac3fa3 100755 (executable)
--- a/libgo/testsuite/gotest
+++ b/libgo/testsuite/gotest
@@ -10,9 +10,10 @@
 
 # Makes egrep,grep work better in general if we put them
 # in ordinary C mode instead of what the current language is.
-unset LANG
-export LC_ALL=C
-export LC_CTYPE=C
+LANG=C
+LC_ALL=C
+LC_CTYPE=C
+export LANG LC_ALL LC_CTYPE
 
 GC=${GC:-gccgo}
 GL=${GL:-${GC-gccgo}}