github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-22 14:23:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

switch to cargo rustc for compiler flags

Browse source
This commit is contained in:
Michael C 2023-05-19 15:13:07 -04:00
commit 688808dc63
No known key found for this signature in database
GPG key ID: FFB04FB3B878B7B4
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
make-linux.mk
View file

@ -62,7 +62,6 @@ ifeq ($(ZT_DEBUG),1)
override CXXFLAGS+=-Wall -Wno-deprecated -g -O -std=c++17 -pthread $(INCLUDES) $(DEFS) override CXXFLAGS+=-Wall -Wno-deprecated -g -O -std=c++17 -pthread $(INCLUDES) $(DEFS)
ZT_TRACE=1 ZT_TRACE=1
RUSTFLAGS= RUSTFLAGS=
CARGOFLAGS=
# The following line enables optimization for the crypto code, since # The following line enables optimization for the crypto code, since
# C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box! # C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box!
node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS) node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
@ -72,8 +71,7 @@ else
CXXFLAGS?=-O3 -fstack-protector CXXFLAGS?=-O3 -fstack-protector
override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS) override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
LDFLAGS=-pie -Wl,-z,relro,-z,now LDFLAGS=-pie -Wl,-z,relro,-z,now
RUSTFLAGS= RUSTFLAGS=--release
CARGOFLAGS=--release
endif endif
ifeq ($(ZT_QNAP), 1) ifeq ($(ZT_QNAP), 1)
@ -412,8 +410,8 @@ debug: FORCE
ifeq ($(ZT_SSO_SUPPORTED), 1) ifeq ($(ZT_SSO_SUPPORTED), 1)
ifeq ($(ZT_EMBEDDED),) ifeq ($(ZT_EMBEDDED),)
zeroidc: FORCE zeroidc: FORCE
# export PATH=/root/.cargo/bin:$$PATH; cd zeroidc && cargo build -j1 $(CARGOFLAGS) # export PATH=/root/.cargo/bin:$$PATH; cd zeroidc && cargo rustc -j1 $(RUSTFLAGS)
export PATH=/${HOME}/.cargo/bin:$$PATH; cd zeroidc && cargo build $(CARGOFLAGS) export PATH=/${HOME}/.cargo/bin:$$PATH; cd zeroidc && cargo rustc $(RUSTFLAGS)
endif endif
else else
zeroidc: zeroidc:
@ -476,7 +474,6 @@ echo_flags:
@echo "echo_flags :: CXXFLAGS=$(CXXFLAGS)" @echo "echo_flags :: CXXFLAGS=$(CXXFLAGS)"
@echo "echo_flags :: LDFLAGS=$(LDFLAGS)" @echo "echo_flags :: LDFLAGS=$(LDFLAGS)"
@echo "echo_flags :: RUSTFLAGS=$(RUSTFLAGS)" @echo "echo_flags :: RUSTFLAGS=$(RUSTFLAGS)"
@echo "echo_flags :: CARGOFLAGS=$(CARGOFLAGS)"
@echo "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~" @echo "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~"
debian: echo_flags debian: echo_flags