Skip to content
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

ci(macos): fix openssl compilation #2602

Merged
merged 1 commit into from
Feb 24, 2025
Merged

ci(macos): fix openssl compilation #2602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
MACOSX_DEPLOYMENT_TARGET: "10.14"
OPENSSL_STATIC: "1"
OPENSSL_DIR: "/usr/local/openssl"
RUSTFLAGS: "-C target-cpu=native -C link-arg=-macosx-version-min=10.14"
RUSTFLAGS: "-C target-cpu=native -C link-arg=-mmacosx-version-min=10.14"
run: |
cargo build --release -p witnet -p witnet_toolkit

Expand Down
3 changes: 0 additions & 3 deletions docker/cross-compilation/openssl-macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ main() {
-fPIC \
${@:1}

# Modify the generated Makefile to use arm64
perl -pi -e 's/-arch x86_64/-arch arm64/g' Makefile

# Build using all available cores
KERNEL_BITS=64 make -j$(sysctl -n hw.ncpu)

Expand Down
Loading