From 52576e5b00ce7c04171491c869e41caf8a438aad Mon Sep 17 00:00:00 2001 From: Will Fife Date: Mon, 6 Oct 2014 09:58:23 -0700 Subject: [PATCH 1/2] Altered the /bin/bash line to use the /usr/bin/env command to acquire the location of bash from the environment. This should work on Linux/OS X/FreeBSD. FreeBSD puts bash in /usr/local/bin instead of /bin/ so builds don't work without modification there. --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index c8c3d31ebd..cb4a8e94f7 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # This script builds the application from source. set -e From 4002ed0db0e296fa0b0d68077fc96b7c36042a83 Mon Sep 17 00:00:00 2001 From: Will Fife Date: Mon, 6 Oct 2014 10:23:29 -0700 Subject: [PATCH 2/2] Removed the FreeBSD export CGO_LDFLAGS option, as the workaround listed is no longer needed, and breaks the build using any recent go on FreeBSD 10. --- scripts/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index cb4a8e94f7..fa2388b0d7 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -28,7 +28,6 @@ fi if [ "$(go env GOOS)" = "freebsd" ]; then export CC="clang" - export CGO_LDFLAGS="$CGO_LDFLAGS -extld clang" # Workaround for https://code.google.com/p/go/issues/detail?id=6845 fi # On OSX, we need to use an older target to ensure binaries are