From 966308eeb7793a4a8ca578e160981e3b059b82e6 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sun, 5 Mar 2017 17:44:14 +0100
Subject: Drop Go 1.4 compatability code everywhere

Yields a nice reduction in code size.
---
 build.bash | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'build.bash')

diff --git a/build.bash b/build.bash
index e492f17..1cc266b 100755
--- a/build.bash
+++ b/build.bash
@@ -38,16 +38,17 @@ BUILDTIME=$(date +%s)
 # Make sure we have the go binary
 go version > /dev/null
 
-# Go 1.5 changed the CLI syntax. Let's also support 1.3 and 1.4.
-# "go version go1.6.2 linux/amd64" -> "1.6"
+# Parse "go version go1.6.2 linux/amd64" to "1.6"
 V=$(go version | cut -d" " -f3 | cut -c3-5)
+# Reject old Go versions already here. It would fail with compile
+# errors anyway.
 if [[ $V == "1.3" || $V == "1.4" ]] ; then
-	LDFLAGS="-X main.GitVersion $GITVERSION -X main.GitVersionFuse $GITVERSIONFUSE -X main.BuildTime $BUILDTIME"
-else
-	# Go 1.5+ wants an "=" here
-	LDFLAGS="-X main.GitVersion=$GITVERSION -X main.GitVersionFuse=$GITVERSIONFUSE -X main.BuildTime=$BUILDTIME"
+	echo "Error: you need Go 1.5 or higher to compile gocryptfs"
+	echo -n "You have: "
+	go version
 fi
 
+LDFLAGS="-X main.GitVersion=$GITVERSION -X main.GitVersionFuse=$GITVERSIONFUSE -X main.BuildTime=$BUILDTIME"
 go build "-ldflags=$LDFLAGS" $@
 
 (cd gocryptfs-xray; go build $@)
-- 
cgit v1.2.3