From 263203ec28584d5c9c671257016b510783ef7c9f Mon Sep 17 00:00:00 2001
From: Aaron Wood <aaronjwood@gmail.com>
Date: Sat, 28 Jan 2017 17:16:34 -0500
Subject: [PATCH] Produce a position independent executable (#4011)

* Produce a position independent executable

* Add OS detection to the main Makefile so we don't apply -pie on OS X
---
 Makefile                 | 5 +++++
 scripts/build_linux64.sh | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c321f82ba..1a60b686f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,13 @@ DATA_FILES := $(shell find conf | sed 's/ /\\ /g')
 LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less)
 GENERATED  := modules/bindata/bindata.go public/css/gogs.css
 
+OS := $(shell uname)
+
 TAGS = ""
 BUILD_FLAGS = "-v"
+ifeq ($(OS),Linux)
+	BUILD_FLAGS += " -buildmode=pie"
+endif
 
 RELEASE_ROOT = "release"
 RELEASE_GOGS = "release/gogs"
diff --git a/scripts/build_linux64.sh b/scripts/build_linux64.sh
index 528fc54cf..8b3a68c2d 100755
--- a/scripts/build_linux64.sh
+++ b/scripts/build_linux64.sh
@@ -5,7 +5,7 @@ outPath=./output_$outPlattform_$outArch
 rm -rf $outPath
 mkdir $outPath
 
-CGO_ENABLED=0 GOOS=$outPlattform GOARCH=$outArch go build ../gogs.go
+CGO_ENABLED=0 GOOS=$outPlattform GOARCH=$outArch go build -buildmode=pie ../gogs.go
 chmod +x gogs
 mv gogs $outPath/