MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 15:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move ARCH correction up

Browse Source
This commit is contained in:
Wildan Mubarok 2025-11-16 14:34:57 +00:00
parent 3f4359c68b
commit aa92cb7d78
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -81,7 +81,7 @@ if [ -z "$ARCH" ] && [ -n "$FILESYSTEM_CONFIG" ]; then
aarch64) : ;; aarch64) : ;;
riscv64gc) : ;; riscv64gc) : ;;
i586) : ;; i586) : ;;
\?) ARCH=""; echo "Unknown Architecture, please specify x86_64, aarch64, risc64gc or i586";; \?) ARCH=""; echo "Unknown Architecture, please specify x86_64, aarch64, riscv64gc or i586";;
esac esac
fi fi

8
mk/config.mk
View File

@ -23,6 +23,10 @@ REPO_NONSTOP?=0
REPO_OFFLINE?=0 REPO_OFFLINE?=0
## Do not strip debug info for local build ## Do not strip debug info for local build
REPO_DEBUG?=0 REPO_DEBUG?=0
## Old config value that need to be corrected
ifeq ($(ARCH),i686)
ARCH=i586
endif
## Select filesystem config ## Select filesystem config
ifeq ($(BOARD),) ifeq ($(BOARD),)
FILESYSTEM_CONFIG?=config/$(ARCH)/$(CONFIG_NAME).toml FILESYSTEM_CONFIG?=config/$(ARCH)/$(CONFIG_NAME).toml
@ -124,10 +128,6 @@ export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt
ifeq ($(ARCH),riscv64gc) ifeq ($(ARCH),riscv64gc)
export TARGET=riscv64gc-unknown-redox export TARGET=riscv64gc-unknown-redox
export GNU_TARGET=riscv64-unknown-redox export GNU_TARGET=riscv64-unknown-redox
else ifeq ($(ARCH),i686)
ARCH=i586
export TARGET=i586-unknown-redox
export GNU_TARGET=i586-unknown-redox
else else
export TARGET=$(ARCH)-unknown-redox export TARGET=$(ARCH)-unknown-redox
export GNU_TARGET=$(ARCH)-unknown-redox export GNU_TARGET=$(ARCH)-unknown-redox