From: Christopher Wedgwood <cw@f00f.org>
Date: Thu, 13 Oct 2011 16:25:25 +0000 (-0400)
Subject: make.bash: more robustly detect gold 2.20
X-Git-Tag: weekly.2011-10-18~92
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=604bd70085868ad22545ae6b3f7c14cd5f3fd5d3;p=gostls13.git

make.bash: more robustly detect gold 2.20

On recent Debian systems the gold 2.20 check triggers though
Debian doesn't have version 2.20 but rather has:

        GNU gold (GNU Binutils for Debian 2.21.52.20110606) 1.11
                                                ^^^^

R=rsc, iant
CC=golang-dev
https://golang.org/cl/5252055
---

diff --git a/src/make.bash b/src/make.bash
index 84b9908f45..57a57077c7 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -10,7 +10,7 @@ if [ ! -f env.bash ]; then
 fi
 . ./env.bash
 
-if ld --version 2>&1 | grep 'gold.*2\.20' >/dev/null; then
+if ld --version 2>&1 | grep 'gold.* 2\.20' >/dev/null; then
 	echo 'ERROR: Your system has gold 2.20 installed.'
 	echo 'This version is shipped by Ubuntu even though'
 	echo 'it is known not to work on Ubuntu.'