diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2018-12-06 13:08:39 -0800 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2018-12-06 13:08:39 -0800 |
| commit | 20f02bb772cde179b6d58f33199aaaead3abba87 (patch) | |
| tree | 65a49e7f4ebb61628e6c29056380f974f54dc3ea /make-linux.mk | |
| parent | 1c86f25fab57f4c2bc3f314683a911959f90b9b8 (diff) | |
| parent | e6f9ab929df19ba667441b005ae2b9771922a92c (diff) | |
| download | infinitytier-20f02bb772cde179b6d58f33199aaaead3abba87.tar.gz infinitytier-20f02bb772cde179b6d58f33199aaaead3abba87.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..90ec2aac 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/ -lpq" CXXFLAGS="-I/usr/pgsql-10/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER" 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 . |