diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-11-13 16:02:31 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-11-13 16:02:31 -0800 |
| commit | 03e35b25b809a9e3c2b046449b72bc4a8440f449 (patch) | |
| tree | 897d0b463c4136ffc19fa8bde524c97140269c3e /make-linux.mk | |
| parent | e2b0fb26b18a5e824e94e61b3404833db9d3a6d8 (diff) | |
| parent | 01c18cc442c03ac9ec18feffba3c97f6a1f4072f (diff) | |
| download | infinitytier-03e35b25b809a9e3c2b046449b72bc4a8440f449.tar.gz infinitytier-03e35b25b809a9e3c2b046449b72bc4a8440f449.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make-linux.mk b/make-linux.mk index 66a6376a..f5c86aeb 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -319,7 +319,7 @@ official: FORCE make -j4 ZT_OFFICIAL=1 all central-controller: FORCE - make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpq" CXXFLAGS="-I/usr/pgsql-10/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one + make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpqxx -lpq" CXXFLAGS="-I/usr/pgsql-10/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one central-controller-docker: central-controller docker build -t gcr.io/zerotier-central/ztcentral-controller:${TIMESTAMP} -f docker/Dockerfile . |