Skip to content

Commit

Permalink
fix(ci): conditional asm feature (#6096)
Browse files Browse the repository at this point in the history
  • Loading branch information
rkrasiuk authored Jan 16, 2024
1 parent be2d6f0 commit 5a623a9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
profile: maxperf
- target: aarch64-unknown-linux-gnu
os: ubuntu-20.04
profile: maxperf-no-asm
profile: maxperf
- target: x86_64-apple-darwin
os: macos-latest
profile: maxperf
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ BUILD_PATH = "target"
ifeq ($(OS),Windows_NT)
FEATURES ?=
else
FEATURES ?= jemalloc
FEATURES ?= jemalloc asm-keccak
endif

# Cargo profile for builds. Default is for local builds, CI uses an override.
Expand Down Expand Up @@ -74,6 +74,9 @@ op-build-native-%:
# No jemalloc on Windows
build-x86_64-pc-windows-gnu: FEATURES := $(filter-out jemalloc jemalloc-prof,$(FEATURES))

# asm keccak optimizations not enabled
build-aarch64-unknown-linux-gnu: FEATURES := $(filter-out asm-keccak,$(FEATURES))

# Note: The additional rustc compiler flags are for intrinsics needed by MDBX.
# See: https://github.com/cross-rs/cross/wiki/FAQ#undefined-reference-with-build-std
build-%:
Expand Down

0 comments on commit 5a623a9

Please sign in to comment.