diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-05-08 14:46:45 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-05-08 14:46:45 -0700 |
| commit | cf49e511a59911d36cea671d039599fcd7811032 (patch) | |
| tree | ce999e2ad345d060e9016554c6986ab02ed1e48a /make-mac.mk | |
| parent | 505b9c7f563ddc441db56489dc79c627971f32ea (diff) | |
| download | infinitytier-cf49e511a59911d36cea671d039599fcd7811032.tar.gz infinitytier-cf49e511a59911d36cea671d039599fcd7811032.zip | |
More makefile changes.
Diffstat (limited to 'make-mac.mk')
| -rw-r--r-- | make-mac.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/make-mac.mk b/make-mac.mk index 938bbf97..de66f49c 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -47,18 +47,22 @@ ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o ext/miniupnpc/connec # Debug mode -- dump trace output, build binary with -g ifeq ($(ZT_DEBUG),1) - DEFS+=-DZT_TRACE - CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS) + ZT_TRACE=1 + CFLAGS+=-Wall -Werror -g $(INCLUDES) $(DEFS) STRIP=echo # The following line enables optimization for the crypto code, since # C25519 in particular is almost UNUSABLE in heavy testing without it. -node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS) +node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g $(INCLUDES) $(DEFS) else CFLAGS?=-Ofast -fstack-protector-strong - CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -pthread -mmacosx-version-min=10.7 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) + CFLAGS+=$(ARCH_FLAGS) -Wall -Werror -flto -fPIE -mmacosx-version-min=10.7 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) STRIP=strip endif +ifeq ($(ZT_TRACE),1) + DEFS+=-DZT_TRACE +endif + CXXFLAGS=$(CFLAGS) -std=c++11 -stdlib=libc++ all: one macui |