From 90f05466987c185bc4c37c8be1c4ebab3b2f548d Mon Sep 17 00:00:00 2001 From: iximeow Date: Tue, 25 Jun 2024 20:42:30 -0700 Subject: fix yaxpeax-arch not building for non-x86 targets when alloc is not enabled --- CHANGELOG | 4 ++++ Makefile | 7 ++++++- src/display/display_sink.rs | 5 ++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d8fd706..8cde9b8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,10 @@ TODO: impls of `fn one` and `fn zero` so downstream users don't have to import n TODO: 0.4.0 or later: * remove `mod colors`, crossterm dependency, related feature flags +## 0.3.2 + +fix yaxpeax-arch not building for non-x86 targets when alloc is not enabled + ## 0.3.1 fix InstructionTextSink::write_char to not panic in debug builds diff --git a/Makefile b/Makefile index efe5c3f..57c8615 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,9 @@ -test: test-std test-no-std test-serde-no-std test-colors-no-std test-color-new-no-std test-alloc-no-std +test: build-smoketest test-std test-no-std test-serde-no-std test-colors-no-std test-color-new-no-std test-alloc-no-std + +build-smoketest: + cargo build + cargo build --no-default-features + cargo build --no-default-features --target wasm32-wasi test-std: cargo test diff --git a/src/display/display_sink.rs b/src/display/display_sink.rs index e83f084..9aa3c85 100644 --- a/src/display/display_sink.rs +++ b/src/display/display_sink.rs @@ -1,13 +1,12 @@ use core::fmt; // `imp_x86.rs` has `asm!()` macros, and so is not portable at all. -#[cfg(feature="alloc")] -#[cfg(target_arch = "x86_64")] +#[cfg(all(feature="alloc", target_arch = "x86_64"))] #[path="./display_sink/imp_x86.rs"] mod imp; // for other architectures, fall back on possibly-slower portable functions. -#[cfg(not(target_arch = "x86_64"))] +#[cfg(all(feature="alloc", not(target_arch = "x86_64")))] #[path="./display_sink/imp_generic.rs"] mod imp; -- cgit v1.1