diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-10-25 11:18:00 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-10-25 13:32:27 +0200 |
| commit | 0a77b5c2c122892402564fbbe5e2d9a1adbc63dc (patch) | |
| tree | 067787a072d64fc98d36a4056c253c700d81d8d0 | |
| parent | ui: do not scroll list view horizontally (diff) | |
| download | wireguard-windows-0a77b5c2c122892402564fbbe5e2d9a1adbc63dc.tar.xz wireguard-windows-0a77b5c2c122892402564fbbe5e2d9a1adbc63dc.zip | |
build: enable aslr and dep
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | build.bat | 3 | ||||
| -rw-r--r-- | embeddable-dll-service/build.bat | 3 |
3 files changed, 7 insertions, 4 deletions
@@ -1,7 +1,7 @@ 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,--major-os-version=6 -Wl,--minor-os-version=1 -Wl,--major-subsystem-version=6 -Wl,--minor-subsystem-version=1 -Wl,--tsaware +export CGO_LDFLAGS := -Wl,--major-os-version=6 -Wl,--minor-os-version=1 -Wl,--major-subsystem-version=6 -Wl,--minor-subsystem-version=1 -Wl,--tsaware -Wl,--dynamicbase -Wl,--nxcompat -Wl,--export-all-symbols export GOOS := windows rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) @@ -24,6 +24,7 @@ resources_386.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) go build $(GOFLAGS) -o $@ @@ -50,6 +51,6 @@ deploy: amd64/wireguard.exe scp $< $(DEPLOYMENT_HOST):$(DEPLOYMENT_PATH) clean: - rm -rf *.syso ui/icon/*.ico x86/ amd64/ .deps/ + rm -rf *.syso ui/icon/*.ico x86/ amd64/ .PHONY: deploy clean fmt remaster all @@ -36,8 +36,9 @@ if exist .deps\prepared goto :render set GOROOT=%BUILDDIR%.deps\go set CGO_ENABLED=1 set CGO_CFLAGS=-O3 -Wall -Wno-unused-function -Wno-switch -std=gnu11 -DWINVER=0x0601 - set CGO_LDFLAGS=-Wl,--major-os-version=6 -Wl,--minor-os-version=1 -Wl,--major-subsystem-version=6 -Wl,--minor-subsystem-version=1 + set CGO_LDFLAGS=-Wl,--major-os-version=6 -Wl,--minor-os-version=1 -Wl,--major-subsystem-version=6 -Wl,--minor-subsystem-version=1 -Wl,--tsaware -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 :sign diff --git a/embeddable-dll-service/build.bat b/embeddable-dll-service/build.bat index 14486696..588e2e18 100644 --- a/embeddable-dll-service/build.bat +++ b/embeddable-dll-service/build.bat @@ -18,8 +18,9 @@ if exist ..\.deps\prepared goto :build set GOROOT=%BUILDDIR%..\.deps\go set CGO_ENABLED=1 set CGO_CFLAGS=-O3 -Wall -Wno-unused-function -Wno-switch -std=gnu11 -DWINVER=0x0601 - set CGO_LDFLAGS=-Wl,--major-os-version=6 -Wl,--minor-os-version=1 -Wl,--major-subsystem-version=6 -Wl,--minor-subsystem-version=1 + set CGO_LDFLAGS=-Wl,--major-os-version=6 -Wl,--minor-os-version=1 -Wl,--major-subsystem-version=6 -Wl,--minor-subsystem-version=1 -Wl,--tsaware -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 :success |