From 2b1619c1e0bfc404012726d3caf5d0b61ec2c234 Mon Sep 17 00:00:00 2001 From: Will Angenent Date: Sat, 15 Apr 2023 18:33:35 +0100 Subject: [PATCH 1/2] Unset CC and CXX before building prefix, since they could interfere --- mk/prefix.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mk/prefix.mk b/mk/prefix.mk index a96ecdf..b17e423 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -7,6 +7,9 @@ export PREFIX_RUSTFLAGS=-L $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX_INSTALL) export REDOXER_TOOLCHAIN=$(RUSTUP_TOOLCHAIN) +export CC= +export CXX= + prefix: $(PREFIX_INSTALL) PREFIX_STRIP=\ From 9b842be049f88a3e25a735d26495452c9afdc574 Mon Sep 17 00:00:00 2001 From: Will Angenent Date: Sat, 15 Apr 2023 18:41:42 +0100 Subject: [PATCH 2/2] Added texinfo as a dependency for building prefix in MacOS --- bootstrap.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bootstrap.sh b/bootstrap.sh index 3b88243..5f156ce 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -109,6 +109,7 @@ osx_macports() install_macports_pkg "ninja" install_macports_pkg "po4a" install_macports_pkg "findutils" + install_macports_pkg "texinfo" } ############################################################################### @@ -144,6 +145,7 @@ osx_homebrew() install_brew_pkg "po4a" install_brew_pkg "macfuse" install_brew_pkg "findutils" + install_brew_pkg "texinfo" install_brew_pkg "redox-os/gcc_cross_compilers/x86_64-elf-gcc" "x86_64-elf-gcc" }