Quellcode durchsuchen

Debian build tweaks, and deparallelize Rust for higher order build parallelization.

Adam Ierymenko vor 3 Jahren
Ursprung
Commit
e31088aaf9
2 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
  1. 1 1
      debian/rules
  2. 3 3
      make-linux.mk

+ 1 - 1
debian/rules

@@ -7,7 +7,7 @@ CXXFLAGS=-O3 -fstack-protector-strong
 	dh $@ --with systemd
 
 override_dh_auto_build:
-	make -j`nproc`
+	make
 
 override_dh_systemd_start:
 	dh_systemd_start --restart-after-upgrade

+ 3 - 3
make-linux.mk

@@ -42,9 +42,9 @@ else
 endif
 
 ifeq ($(ZT_DEBUG),1)
-	LDLIBS+=zeroidc/target/debug/libzeroidc.a -ldl
+	LDLIBS+=zeroidc/target/debug/libzeroidc.a -ldl -lssl -lcrypto
 else
-	LDLIBS+=zeroidc/target/release/libzeroidc.a -ldl
+	LDLIBS+=zeroidc/target/release/libzeroidc.a -ldl -lssl -lcrypto
 endif
 
 # Use bundled http-parser since distribution versions are NOT API-stable or compatible!
@@ -372,7 +372,7 @@ debug:	FORCE
 	make ZT_DEBUG=1 selftest
 
 zeroidc:	FORCE
-	cd zeroidc && cargo build $(RUSTFLAGS)
+	export PATH=/root/.cargo/bin:$$PATH; cd zeroidc && cargo build -j1 $(RUSTFLAGS)
 
 # Note: keep the symlinks in /var/lib/zerotier-one to the binaries since these
 # provide backward compatibility with old releases where the binaries actually