From 5fc093ca9a0b815326a15f0a65392fc3552f52d8 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 19 Aug 2022 10:05:54 -0600
Subject: [PATCH] Simplify bootstrap recipe
---
recipes/bootstrap/recipe.toml | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/recipes/bootstrap/recipe.toml b/recipes/bootstrap/recipe.toml
index 824e691be..8ad318ce6 100644
--- a/recipes/bootstrap/recipe.toml
+++ b/recipes/bootstrap/recipe.toml
@@ -5,18 +5,6 @@ git = "https://gitlab.redox-os.org/redox-os/bootstrap.git"
template = "custom"
script = """
ARCH="$(echo "${TARGET}" | cut -d - -f1)"
-case "${ARCH}" in
- i686)
- NASM_FORMAT=elf32
- ;;
- *)
- NASM_FORMAT=elf64
- ;;
-esac
-nasm \
- -o "${COOKBOOK_BUILD}/asm.o" \
- -f "${NASM_FORMAT}" \
- "${COOKBOOK_SOURCE}/src/${ARCH}.asm"
cargo \
-Zbuild-std=core,alloc,compiler_builtins \
-Zbuild-std-features=compiler-builtins-mem rustc \
@@ -31,6 +19,5 @@ mkdir -v "${COOKBOOK_STAGE}/boot"
-o "${COOKBOOK_STAGE}/boot/bootstrap" \
--gc-sections \
-T "${COOKBOOK_SOURCE}/src/${ARCH}.ld" \
- "${COOKBOOK_BUILD}/asm.o" \
"${COOKBOOK_BUILD}/${TARGET}/release/libbootstrap.a"
"""
--
GitLab