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.

33 lines
1.1 KiB

  1. From 7cfe751128d412a9b780ba5e4cb11908fc71cd3d 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/4] 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. diff --git a/make-linux.mk b/make-linux.mk
  11. index 0cd955d1..add1d3ae 100644
  12. --- a/make-linux.mk
  13. +++ b/make-linux.mk
  14. @@ -71,11 +71,11 @@ ifeq ($(ZT_DEBUG),1)
  15. # C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box!
  16. node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
  17. else
  18. - CFLAGS?=-O3 -fstack-protector -fPIE
  19. + CFLAGS?=-O3 -fstack-protector
  20. override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
  21. - CXXFLAGS?=-O3 -fstack-protector -fPIE
  22. + CXXFLAGS?=-O3 -fstack-protector
  23. override CXXFLAGS+=-Wall -Wno-deprecated -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
  24. - LDFLAGS=-pie -Wl,-z,relro,-z,now
  25. + LDFLAGS=-Wl,-z,relro,-z,now
  26. STRIP?=strip
  27. STRIP+=--strip-all
  28. endif
  29. --
  30. 2.17.0