From 9eebc1577644d01799bd9ab345c9905c54c90da2 Mon Sep 17 00:00:00 2001
From: Will Angenent <will.angenent@gmail.com>
Date: Sat, 8 Apr 2023 15:22:38 +0100
Subject: [PATCH] Fix packaging in MacOS
Setting CC= isn't enough in MacOS, AR and RANLIB also need replacing. Without this,
bits are compiled for redox instead of the host leading to linker target mismatches.
---
cook.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cook.sh b/cook.sh
index f66e4f93b..99d20102b 100755
--- a/cook.sh
+++ b/cook.sh
@@ -23,15 +23,15 @@ fi
if [ ! "$(uname -s)" = "Redox" ]
then
function docgen {
- CC=cc cargo run --release --manifest-path "$ROOT/docgen/Cargo.toml" --bin docgen -- "$@"
+ CC=cc AR=ar RANLIB=ranlib cargo run --release --manifest-path "$ROOT/docgen/Cargo.toml" --bin docgen -- "$@"
}
function pkg {
- CC=cc cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- "$@"
+ CC=cc AR=ar RANLIB=ranlib cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- "$@"
}
function pkgar {
- CC=cc cargo run --release --manifest-path "$ROOT/pkgar/Cargo.toml" --bin pkgar -- "$@"
+ CC=cc AR=ar RANLIB=ranlib cargo run --release --manifest-path "$ROOT/pkgar/Cargo.toml" --bin pkgar -- "$@"
}
fi
--
GitLab