From d01b1ffde51c2becef6ed0b55dfde1659aaa474f Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 4 May 2018 12:09:04 -0700 Subject: Added -fPIC for Synology builds --- make-linux.mk | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'make-linux.mk') diff --git a/make-linux.mk b/make-linux.mk index 2e6a8632..a571f344 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -42,14 +42,6 @@ endif # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems. ONE_OBJS+=ext/http-parser/http_parser.o -ifeq ($(ZT_SYNOLOGY), 1) - override DEFS+=-D__SYNOLOGY__ -endif - -ifeq ($(ZT_QNAP), 1) - override DEFS+=-D__QNAP__ -endif - ifeq ($(ZT_TRACE),1) override DEFS+=-DZT_TRACE endif @@ -80,6 +72,15 @@ else STRIP+=--strip-all endif +ifeq ($(ZT_QNAP), 1) + override DEFS+=-D__QNAP__ +endif + +ifeq ($(ZT_SYNOLOGY), 1) + CXXFLAGS+=-fPIC + override DEFS+=-D__SYNOLOGY__ +endif + ifeq ($(ZT_TRACE),1) override DEFS+=-DZT_TRACE endif -- cgit v1.2.3 From c8a907fd71393ac8cdf1664952544c99973e4c79 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 4 May 2018 13:03:52 -0700 Subject: Added override directive to CXXFLAGS for Synology builds in make-linux.mk --- make-linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'make-linux.mk') diff --git a/make-linux.mk b/make-linux.mk index a571f344..1280e895 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -77,7 +77,7 @@ ifeq ($(ZT_QNAP), 1) endif ifeq ($(ZT_SYNOLOGY), 1) - CXXFLAGS+=-fPIC + override CXXFLAGS+=-fPIC override DEFS+=-D__SYNOLOGY__ endif -- cgit v1.2.3 From 22301a459970dc557c4959104afe418d4b2d6bb1 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 4 May 2018 14:31:34 -0700 Subject: Added override directive to CFLAGS for Synology builds in make-linux.mk --- make-linux.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'make-linux.mk') diff --git a/make-linux.mk b/make-linux.mk index 1280e895..4a2a3e2d 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -77,6 +77,7 @@ ifeq ($(ZT_QNAP), 1) endif ifeq ($(ZT_SYNOLOGY), 1) + override CFLAGS+=-fPIC override CXXFLAGS+=-fPIC override DEFS+=-D__SYNOLOGY__ endif -- cgit v1.2.3