diff options
| author | Adam Ierymenko <[email protected]> | 2022-01-20 11:16:26 -0500 |
|---|---|---|
| committer | Adam Ierymenko <[email protected]> | 2022-01-20 11:16:26 -0500 |
| commit | 58aba9649488f03116708d65adcace77d45466e6 (patch) | |
| tree | b5a96235ffc984a827ceb6fa2a12f267cd342b29 /make-mac.mk | |
| parent | f8d7796099c5f497abed861ebe1f17da18722f60 (diff) | |
Mac Rust build fix.
Diffstat (limited to 'make-mac.mk')
| -rw-r--r-- | make-mac.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/make-mac.mk b/make-mac.mk index 4655c861..ca1fed6a 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -75,7 +75,6 @@ ifeq ($(ZT_DEBUG),1) ARCH_FLAGS= CFLAGS+=-Wall -g $(INCLUDES) $(DEFS) $(ARCH_FLAGS) STRIP=echo - RUSTFLAGS= RUST_VARIANT=debug # The following line enables optimization for the crypto code, since # C25519 in particular is almost UNUSABLE in heavy testing without it. @@ -84,7 +83,6 @@ else CFLAGS?=-Ofast -fstack-protector-strong CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -mmacosx-version-min=$(MACOS_VERSION_MIN) -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) STRIP=strip - RUSTFLAGS=--release RUST_VARIANT=release endif @@ -121,8 +119,8 @@ zerotier-one: one zeroidc: zeroidc/target/libzeroidc.a zeroidc/target/libzeroidc.a: FORCE - cd zeroidc && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build --target=x86_64-apple-darwin $(RUSTFLAGS) - cd zeroidc && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build --target=aarch64-apple-darwin $(RUSTFLAGS) + cd zeroidc && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build --target=x86_64-apple-darwin --$(RUST_VARIANT) + cd zeroidc && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build --target=aarch64-apple-darwin --$(RUST_VARIANT) cd zeroidc && lipo -create target/x86_64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a target/aarch64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a central-controller: |