Skip to content

Dev: fix darwin universal targets #6383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gmalouf merged 2 commits into from
Jul 17, 2025
Merged

Dev: fix darwin universal targets #6383

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
190339d
Don't try to lipo node_exporter, which is already using universal
onetechnical Jul 16, 2025
31ece3f
Copy nongo files for universal builds. Also remove cross arch builds …
onetechnical Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ ifeq ($(OS_TYPE),darwin)
mkdir -p $(GOBIN)
for binary in $$(ls $(GOBIN)-darwin-arm64); do \
skip=false; \
for nongo_file in $(NONGO_BIN_FILES) $(GOBIN)/update.sh ; do \
for nongo_file in $(NONGO_BIN_FILES) $(GOBIN)/node_exporter; do \
if [ "$(GOBIN)/$$binary" = "$$nongo_file" ]; then \
echo "Skipping non-binary file: $$binary"; \
skip=true; \
Expand All @@ -213,8 +213,17 @@ ifeq ($(OS_TYPE),darwin)
echo "Warning: Binary $$binary exists in arm64 but not in amd64"; \
fi; \
done
# for node_exporter cross-compilation is using universal binary already
cp -f $(GOBIN)-darwin-arm64/node_exporter $(GOBIN)/node_exporter
# copy NONGO_BIN files
for nongo_file in $(NONGO_BIN_FILES); do \
short_name=$$(basename $$nongo_file); \
if [ -f $(GOBIN)-darwin-arm64/$$short_name ]; then \
cp -f $(GOBIN)-darwin-arm64/$$short_name $$nongo_file; \
else \
echo "Warning: NONGO_BIN file $$short_name does not exist in arm64"; \
fi; \
done
# for node_exporter cross-compilation is using universal binary already
cp -f $(GOBIN)-darwin-arm64/node_exporter $(GOBIN)/node_exporter
else
echo "OS_TYPE must be darwin for universal builds, skipping"
endif
Expand Down Expand Up @@ -336,6 +345,7 @@ clean:
rm -rf crypto/libs
rm -rf crypto/copies
rm -rf ./gen/devnet ./gen/mainnetnet ./gen/testnet
rm -rf $(GOBIN)-darwin-amd64 $(GOBIN)-darwin-arm64

# clean without crypto
cleango:
Expand Down
Loading