aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-11-07 19:05:45 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2020-11-13 14:42:54 +0100
commitb4cd7e112639817cf7744e6df5f7d21e3cacb901 (patch)
tree0d0aa2246200f73b08575cb51f505ed7b9a61ca9
parentinstaller: move wg.exe to C:\Program Files\WireGuard (diff)
downloadwireguard-windows-b4cd7e112639817cf7744e6df5f7d21e3cacb901.tar.xz
wireguard-windows-b4cd7e112639817cf7744e6df5f7d21e3cacb901.zip
build: remove duplicated ld flags
These are finally in Go 1.15. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--Makefile2
-rw-r--r--build.bat2
2 files changed, 0 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 15309004..18fb7125 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
GOFLAGS := -ldflags="-H windowsgui -s -w" -v -tags walk_use_cgo -trimpath
export CGO_ENABLED := 1
export CGO_CFLAGS := -O3 -Wall -Wno-unused-function -Wno-switch -std=gnu11 -DWINVER=0x0601
-export CGO_LDFLAGS := -Wl,--dynamicbase -Wl,--nxcompat -Wl,--export-all-symbols
export GOOS := windows
VERSION := $(shell sed -n 's/^\s*Number\s*=\s*"\([0-9.]\+\)"$$/\1/p' version/version.go)
@@ -48,7 +47,6 @@ resources_arm.syso: $(RESOURCE_FILES)
amd64/wireguard.exe: export CC := x86_64-w64-mingw32-gcc
amd64/wireguard.exe: export GOARCH := amd64
-amd64/wireguard.exe: CGO_LDFLAGS += -Wl,--high-entropy-va
amd64/wireguard.exe: resources_amd64.syso $(SOURCE_FILES)
GOROOT="$(CURDIR)/.deps/goroot" go build $(GOFLAGS) -o $@
diff --git a/build.bat b/build.bat
index ece082cd..1a79b79b 100644
--- a/build.bat
+++ b/build.bat
@@ -47,9 +47,7 @@ if exist .deps\prepared goto :render
)
set CGO_ENABLED=1
set CGO_CFLAGS=-O3 -Wall -Wno-unused-function -Wno-switch -std=gnu11 -DWINVER=0x0601
- set CGO_LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--export-all-symbols
call :build_plat x86 i686 386 || goto :error
- set CGO_LDFLAGS=%CGO_LDFLAGS% -Wl,--high-entropy-va
call :build_plat amd64 x86_64 amd64 || goto :error
set CGO_ENABLED=0
set GOARM=7