github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-19 13:01:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix macos build

Browse source
This commit is contained in:
Grant Limberg 2025-08-05 16:18:21 -07:00
commit a55216310a
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
make-mac.mk
View file

@ -129,9 +129,9 @@ osdep/MacDNSHelper.o: osdep/MacDNSHelper.mm
$(CXX) $(CXXFLAGS) -c osdep/MacDNSHelper.mm -o osdep/MacDNSHelper.o $(CXX) $(CXXFLAGS) -c osdep/MacDNSHelper.mm -o osdep/MacDNSHelper.o
ifeq ($(ZT_CONTROLLER),1) ifeq ($(ZT_CONTROLLER),1)
one: otel zeroidc smeeclient $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent one: otel rustybits $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent
else else
one: otel zeroidc $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent one: otel rustybits $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent
endif endif
$(CXX) $(CXXFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LIBS) rustybits/target/librustybits.a $(CXX) $(CXXFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LIBS) rustybits/target/librustybits.a
# $(STRIP) zerotier-one # $(STRIP) zerotier-one
@ -143,15 +143,6 @@ zerotier-one: one
rustybits: rustybits/target/rustybits.a rustybits: rustybits/target/rustybits.a
# ifeq ($(ZT_CONTROLLER),1)
# smeeclient: rustybits/target/libsmeeclient.a
# rustybits/target/libsmeeclient.a: FORCE
# cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -F smeeclient --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS)
# cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -F smeeclient --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS)
# cd rustybits && lipo -create target/x86_64-apple-darwin/$(RUST_VARIANT)/libsmeeclient.a target/aarch64-apple-darwin/$(RUST_VARIANT)/libsmeeclient.a -output target/libsmeeclient.a
# endif
rustybits/target/rustybits.a: FORCE rustybits/target/rustybits.a: FORCE
cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS) cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS)
cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS) cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS)
@ -164,7 +155,7 @@ zerotier-idtool: one
zerotier-cli: one zerotier-cli: one
$(ONE_OBJS): zeroidc $(ONE_OBJS): rustybits
libzerotiercore.a: $(CORE_OBJS) libzerotiercore.a: $(CORE_OBJS)
ar rcs libzerotiercore.a $(CORE_OBJS) ar rcs libzerotiercore.a $(CORE_OBJS)