blob: 12e00b598975dfa7263fe2cdc61e7f78f75dde3e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
https://github.com/zerotier/ZeroTierOne/pull/2162
From 55485ad51e5de6a344f7dc7f352df1876fa747ea Mon Sep 17 00:00:00 2001
From: Alfred Wingate <parona@protonmail.com>
Date: Sun, 29 Oct 2023 14:11:13 +0200
Subject: [PATCH 1/2] Respect user LDFLAGS
* Respect user LDFLAGS instead of replacing them.
Signed-off-by: Alfred Wingate <parona@protonmail.com>
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -71,7 +71,7 @@ else
override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
CXXFLAGS?=-O3 -fstack-protector
override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
- LDFLAGS=-pie -Wl,-z,relro,-z,now
+ LDFLAGS?=-pie -Wl,-z,relro,-z,now
ZT_CARGO_FLAGS=--release
endif
--
2.45.1
|
