You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

28 lines
1.1 KiB

  1. From ef1a75fd1bf271cc5c73d966a861dfcd26d62cd5 Mon Sep 17 00:00:00 2001
  2. From: Moritz Warning <moritzwarning@web.de>
  3. Date: Mon, 30 Apr 2018 16:14:30 +0200
  4. Subject: [PATCH 2/8] remove -pie
  5. fixes relocation "against `a local symbol' can not be used
  6. when making a shared object; recompile with -fPIC" error
  7. ---
  8. make-linux.mk | 6 +++---
  9. 1 file changed, 3 insertions(+), 3 deletions(-)
  10. --- a/make-linux.mk
  11. +++ b/make-linux.mk
  12. @@ -69,11 +69,11 @@ ifeq ($(ZT_DEBUG),1)
  13. # C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box!
  14. node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
  15. else
  16. - CFLAGS?=-O3 -fstack-protector -fPIE
  17. + CFLAGS?=-O3 -fstack-protector
  18. override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
  19. - CXXFLAGS?=-O3 -fstack-protector -fPIE
  20. + CXXFLAGS?=-O3 -fstack-protector
  21. override CXXFLAGS+=-Wall -Wno-deprecated -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
  22. - LDFLAGS=-pie -Wl,-z,relro,-z,now
  23. + LDFLAGS=-Wl,-z,relro,-z,now
  24. STRIP?=strip
  25. STRIP+=--strip-all
  26. endif