mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-17 15:34:18 +08:00
Adjust bootstrap script for MacOS
This commit is contained in:
parent
976506eedf
commit
5b9da35b7e
@ -70,8 +70,6 @@ install_freebsd_pkg()
|
||||
##############################################################################
|
||||
osx()
|
||||
{
|
||||
echo "Detected macOS!"
|
||||
|
||||
if [ ! -z "$(which brew)" ]; then
|
||||
osx_homebrew $@
|
||||
elif [ ! -z "$(which port)" ]; then
|
||||
@ -1076,7 +1074,14 @@ done
|
||||
|
||||
banner
|
||||
|
||||
rustInstall "$noninteractive"
|
||||
if [ "Darwin" == "$(uname -s)" ]; then
|
||||
echo "Detected macOS!"
|
||||
|
||||
echo "WARNING: Building Redox OS on MacOS is not recommended, please use podman_bootstrap.sh instead."
|
||||
echo "WARNING: Our toolchain is not designed to work on MacOS and it relies on FUSE which requires kernel extensions."
|
||||
echo "WARNING: If you want to continue anyway, please wait for 3 seconds or cancel this script now!"
|
||||
sleep 3
|
||||
fi
|
||||
|
||||
if [ "$update" == "true" ]; then
|
||||
git pull upstream master
|
||||
@ -1084,6 +1089,8 @@ if [ "$update" == "true" ]; then
|
||||
exit
|
||||
fi
|
||||
|
||||
rustInstall "$noninteractive"
|
||||
|
||||
if [ "Darwin" == "$(uname -s)" ]; then
|
||||
osx "$emulator"
|
||||
else
|
||||
|
||||
@ -128,7 +128,6 @@ osx_homebrew()
|
||||
install_brew_pkg "git"
|
||||
install_brew_pkg "make"
|
||||
install_brew_pkg "curl"
|
||||
install_brew_pkg "slirp4netns"
|
||||
install_brew_pkg "podman"
|
||||
install_brew_pkg "gdb"
|
||||
|
||||
@ -502,6 +501,10 @@ boot()
|
||||
git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive
|
||||
echo "Creating .config with PODMAN_BUILD=1"
|
||||
echo 'PODMAN_BUILD?=1' > redox/.config
|
||||
if [[ "$(uname -m)" == "arm64" ]]; then
|
||||
echo "Appending .config with ARCH=aarch64"
|
||||
echo 'ARCH=aarch64' >> redox/.config
|
||||
fi
|
||||
echo "Cleaning up..."
|
||||
rm podman_bootstrap.sh
|
||||
echo
|
||||
|
||||
Loading…
Reference in New Issue
Block a user