diff options
| author | Aaron Wood <aaronjwood@gmail.com> | 2017-01-28 17:16:34 -0500 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2017-01-28 17:16:34 -0500 |
| commit | 263203ec28584d5c9c671257016b510783ef7c9f (patch) | |
| tree | 98507d985e4d69211c4520d7250a8eceb5562f20 | |
| parent | 84f28fc5d667a24caf24a000047c4af6efe1af16 (diff) | |
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
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | scripts/build_linux64.sh | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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 528fc54c..8b3a68c2 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/ |