diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-27 09:25:34 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-27 09:25:34 -0700 |
| commit | 8de5b2beda6d2e9102d3e77e179c0dc785b8e024 (patch) | |
| tree | e515a6a45946699a6639657ab1b8fcf5a677739f /make-linux.mk | |
| parent | b02c3dfe8d84d6f8cefd239d0e6fa545fcc89136 (diff) | |
| download | infinitytier-8de5b2beda6d2e9102d3e77e179c0dc785b8e024.tar.gz infinitytier-8de5b2beda6d2e9102d3e77e179c0dc785b8e024.zip | |
RPM build fixes -- use RPM cflags, spec fixes, etc.
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/make-linux.mk b/make-linux.mk index 303bdea4..6706492e 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -94,10 +94,14 @@ ifeq ($(ZT_ENABLE_CLUSTER),1) DEFS+=-DZT_ENABLE_CLUSTER endif +ifeq ($(ZT_TRACE),1) + DEFS+=-DZT_TRACE +endif + ifeq ($(ZT_DEBUG),1) DEFS+=-DZT_TRACE - CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS) - CXXFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS) + override CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS) + override CXXFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS) LDFLAGS= STRIP?=echo # The following line enables optimization for the crypto code, since @@ -105,18 +109,14 @@ ifeq ($(ZT_DEBUG),1) ext/lz4/lz4.o node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS) else CFLAGS?=-O3 -fstack-protector-strong - CFLAGS+=-Wall -fPIE -fvisibility=hidden -pthread $(INCLUDES) -DNDEBUG $(DEFS) + override CFLAGS+=-Wall -fPIE -pthread $(INCLUDES) -DNDEBUG $(DEFS) CXXFLAGS?=-O3 -fstack-protector-strong - CXXFLAGS+=-Wall -Wno-unused-result -Wreorder -fPIE -fvisibility=hidden -fno-rtti -pthread $(INCLUDES) -DNDEBUG $(DEFS) + override CXXFLAGS+=-Wall -Wno-unused-result -Wreorder -fPIE -fno-rtti -pthread $(INCLUDES) -DNDEBUG $(DEFS) LDFLAGS=-pie -Wl,-z,relro,-z,now STRIP?=strip STRIP+=--strip-all endif -ifeq ($(ZT_TRACE),1) - DEFS+=-DZT_TRACE -endif - # Uncomment for gprof profile build #CFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS) #CXXFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS) |