diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-05-30 11:19:12 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-05-30 11:19:12 -0700 |
| commit | 8199dbd0dcbc3259eb3218ece183315eddb1e84b (patch) | |
| tree | e5f6b7a58bb9d0aa87958bcca7ea265e45519ee6 /make-linux.mk | |
| parent | 91c8e82c428cea9d9e0a6911fbd1820212871ad8 (diff) | |
| parent | c0efba79c70ee537813efd333302dc588668cbce (diff) | |
| download | infinitytier-8199dbd0dcbc3259eb3218ece183315eddb1e84b.tar.gz infinitytier-8199dbd0dcbc3259eb3218ece183315eddb1e84b.zip | |
Merge branch 'dev' into edge
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/make-linux.mk b/make-linux.mk index d089b791..0f5ef384 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,16 @@ else STRIP+=--strip-all endif +ifeq ($(ZT_QNAP), 1) + override DEFS+=-D__QNAP__ +endif + +ifeq ($(ZT_SYNOLOGY), 1) + override CFLAGS+=-fPIC + override CXXFLAGS+=-fPIC + override DEFS+=-D__SYNOLOGY__ +endif + ifeq ($(ZT_TRACE),1) override DEFS+=-DZT_TRACE endif @@ -114,6 +116,12 @@ ifeq ($(CC_MACH),amd64) endif ifeq ($(CC_MACH),powerpc64le) ZT_ARCHITECTURE=8 + override DEFS+=-DZT_NO_TYPE_PUNNING +endif +ifeq ($(CC_MACH),powerpc) + ZT_ARCHITECTURE=8 + override DEFS+=-DZT_NO_TYPE_PUNNING + override DEFS+=-DZT_NO_CAPABILITIES endif ifeq ($(CC_MACH),ppc64le) ZT_ARCHITECTURE=8 @@ -202,10 +210,6 @@ ifeq ($(CC_MACH),mips64el) ZT_ARCHITECTURE=6 override DEFS+=-DZT_NO_TYPE_PUNNING endif -ifeq ($(CC_MACH),powerpc64le) - ZT_ARCHITECTURE=7 - override DEFS+=-DZT_NO_TYPE_PUNNING -endif # Fail if system architecture could not be determined ifeq ($(ZT_ARCHITECTURE),999) @@ -291,7 +295,7 @@ manpages: FORCE doc: manpages clean: FORCE - rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o + rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o debian/.debhelper debian/debhelper-build-stamp distclean: clean @@ -360,7 +364,7 @@ debian: FORCE debuild -I -i -us -uc -nc -b debian-clean: FORCE - rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one + rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one debian/.debhelper debian/debhelper-build-stamp redhat: FORCE rpmbuild -ba zerotier-one.spec |