vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Ensure that rustc supports the host target correctly

Browse source
This commit is contained in:
Jeremy Soller 2022-07-26 12:26:27 -06:00
parent 31e0336c7a
commit 3d41e23043
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mk/config.mk
View file

@ -13,6 +13,7 @@ FILESYSTEM_SIZE?=256
REDOXFS_MKFS_FLAGS?= REDOXFS_MKFS_FLAGS?=
# Per host variables # Per host variables
HOST_ARCH=x86_64 # TODO: get automatically
HOST_CARGO=env --unset=RUSTUP_TOOLCHAIN cargo HOST_CARGO=env --unset=RUSTUP_TOOLCHAIN cargo
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME),Darwin) ifeq ($(UNAME),Darwin)
@ -22,7 +23,7 @@ ifeq ($(UNAME),Darwin)
PREFIX_BINARY=0 PREFIX_BINARY=0
VB_AUDIO=coreaudio VB_AUDIO=coreaudio
VBM=/Applications/VirtualBox.app/Contents/MacOS/VBoxManage VBM=/Applications/VirtualBox.app/Contents/MacOS/VBoxManage
HOST_TARGET ?= $(ARCH)-apple-darwin HOST_TARGET ?= $(HOST_ARCH)-apple-darwin
else ifeq ($(UNAME),FreeBSD) else ifeq ($(UNAME),FreeBSD)
FUMOUNT=sudo umount FUMOUNT=sudo umount
export NPROC=sysctl -n hw.ncpu export NPROC=sysctl -n hw.ncpu
@ -30,14 +31,14 @@ else ifeq ($(UNAME),FreeBSD)
PREFIX_BINARY=0 PREFIX_BINARY=0
VB_AUDIO=pulse # To check, will probaly be OSS on most setups VB_AUDIO=pulse # To check, will probaly be OSS on most setups
VBM=VBoxManage VBM=VBoxManage
HOST_TARGET ?= $(ARCH)-unknown-freebsd HOST_TARGET ?= $(HOST_ARCH)-unknown-freebsd
else else
FUMOUNT=fusermount -u FUMOUNT=fusermount -u
export NPROC=nproc export NPROC=nproc
export REDOX_MAKE=make export REDOX_MAKE=make
VB_AUDIO=pulse VB_AUDIO=pulse
VBM=VBoxManage VBM=VBoxManage
HOST_TARGET ?= $(ARCH)-unknown-linux-gnu HOST_TARGET ?= $(HOST_ARCH)-unknown-linux-gnu
endif endif
# Automatic variables # Automatic variables
@ -55,6 +56,8 @@ INSTALLER=\
## Bootloader variables ## Bootloader variables
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
BOOTLOADER_TARGET=x86-unknown-none BOOTLOADER_TARGET=x86-unknown-none
else ifeq ($(ARCH),i686)
BOOTLOADER_TARGET=x86-unknown-none
else else
BOOTLOADER_TARGET=$(ARCH)-unknown-none BOOTLOADER_TARGET=$(ARCH)-unknown-none
endif endif