From 5a623a9c1285d986fc46f1091d58d7a388323457 Mon Sep 17 00:00:00 2001 From: Roman Krasiuk Date: Tue, 16 Jan 2024 20:15:12 +0100 Subject: [PATCH] fix(ci): conditional asm feature (#6096) --- .github/workflows/release.yml | 2 +- Makefile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 373702c8f..826e03a31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/Makefile b/Makefile index 8f55fdb02..d97fbd414 100644 --- a/Makefile +++ b/Makefile @@ -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. @@ -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-%: