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

Merge branch 'unset-cc-and-cxx-in-prefix-build' into 'master'

Browse source 
Two fixes for the MacOS prefix build

Closes #1372

See merge request redox-os/redox!1331
This commit is contained in:
Jeremy Soller 2023-04-17 14:27:44 +00:00
parent 226954e8b4 9b842be049
commit 2ae7a392a7
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrap.sh
View file

@ -109,6 +109,7 @@ osx_macports()
install_macports_pkg "ninja" install_macports_pkg "ninja"
install_macports_pkg "po4a" install_macports_pkg "po4a"
install_macports_pkg "findutils" install_macports_pkg "findutils"
install_macports_pkg "texinfo"
} }
############################################################################### ###############################################################################
@ -144,6 +145,7 @@ osx_homebrew()
install_brew_pkg "po4a" install_brew_pkg "po4a"
install_brew_pkg "macfuse" install_brew_pkg "macfuse"
install_brew_pkg "findutils" install_brew_pkg "findutils"
install_brew_pkg "texinfo"
install_brew_pkg "redox-os/gcc_cross_compilers/x86_64-elf-gcc" "x86_64-elf-gcc" install_brew_pkg "redox-os/gcc_cross_compilers/x86_64-elf-gcc" "x86_64-elf-gcc"
} }

3
mk/prefix.mk
View file

@ -7,6 +7,9 @@ export PREFIX_RUSTFLAGS=-L $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib
export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX_INSTALL) export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX_INSTALL)
export REDOXER_TOOLCHAIN=$(RUSTUP_TOOLCHAIN) export REDOXER_TOOLCHAIN=$(RUSTUP_TOOLCHAIN)
export CC=
export CXX=
prefix: $(PREFIX_INSTALL) prefix: $(PREFIX_INSTALL)
PREFIX_STRIP=\ PREFIX_STRIP=\