diff --git a/recipes/bootstrap/recipe.toml b/recipes/bootstrap/recipe.toml index 824e691be1db0b8b04083f1d6d239b51704edf37..8ad318ce67a012f95fe9d185005c357d03ed2bb7 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" """