From 628825fdfffe1dbee6684ac3c197cd71d6e9bcae Mon Sep 17 00:00:00 2001 From: Bananymous Date: Tue, 5 Aug 2025 03:47:16 +0300 Subject: [PATCH] ports: Don't set CMAKE_TOOLCHAIN_FILE environment variable This doesn't allow llvm to build native tablegen --- ports/SDL2/build.sh | 2 +- ports/cmake/build.sh | 2 +- ports/install.sh | 2 -- ports/sdl12-compat/build.sh | 6 +++--- ports/zstd/build.sh | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ports/SDL2/build.sh b/ports/SDL2/build.sh index 2082cea4..c9621efa 100755 --- a/ports/SDL2/build.sh +++ b/ports/SDL2/build.sh @@ -8,7 +8,7 @@ DEPENDENCIES=('mesa') configure() { $BANAN_CMAKE \ - --toolchain="$CMAKE_TOOLCHAIN_FILE" \ + --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ --fresh -GNinja -S . -B build \ -DCMAKE_INSTALL_PREFIX='/usr' \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ports/cmake/build.sh b/ports/cmake/build.sh index 210308e1..74472095 100755 --- a/ports/cmake/build.sh +++ b/ports/cmake/build.sh @@ -7,7 +7,7 @@ DEPENDENCIES=('openssl' 'libuv' 'make' 'bash') configure() { $BANAN_CMAKE \ - --toolchain=$BANAN_TOOLCHAIN_DIR/Toolchain.txt \ + --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ -B build -GNinja --fresh \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_USE_OPENSSL=ON \ diff --git a/ports/install.sh b/ports/install.sh index ad360591..18a886aa 100755 --- a/ports/install.sh +++ b/ports/install.sh @@ -29,8 +29,6 @@ export OBJDUMP="$BANAN_TOOLCHAIN_TRIPLE-objdump" export STRIP="$BANAN_TOOLCHAIN_TRIPLE-strip" export CXXFILT="$BANAN_TOOLCHAIN_TRIPLE-c++filt" -export CMAKE_TOOLCHAIN_FILE="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" - pushd "$BANAN_ROOT_DIR" >/dev/null ./bos all && ./bos install || exit 1 popd >/dev/null diff --git a/ports/sdl12-compat/build.sh b/ports/sdl12-compat/build.sh index f900c407..7ac213d9 100755 --- a/ports/sdl12-compat/build.sh +++ b/ports/sdl12-compat/build.sh @@ -10,9 +10,9 @@ configure() { sed -i 's/CMAKE_INSTALL_FULL_DATAROOTDIR/CMAKE_INSTALL_FULL_DATADIR/' CMakeLists.txt $BANAN_CMAKE \ - --toolchain="$CMAKE_TOOLCHAIN_FILE" \ - --fresh -GNinja -S . -B build \ - -DCMAKE_INSTALL_PREFIX="$BANAN_SYSROOT/usr" \ + --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ + --fresh -GNinja -S . -B build \ + -DCMAKE_INSTALL_PREFIX="$BANAN_SYSROOT/usr" \ -DSDL2_INCLUDE_DIR="$BANAN_SYSROOT/usr/include/SDL2" } diff --git a/ports/zstd/build.sh b/ports/zstd/build.sh index 09a8794a..2cbfed7e 100755 --- a/ports/zstd/build.sh +++ b/ports/zstd/build.sh @@ -6,7 +6,7 @@ DOWNLOAD_URL="https://github.com/facebook/zstd/releases/download/v$VERSION/zstd- configure() { $BANAN_CMAKE -B _build -S build/cmake -G Ninja \ - --toolchain $BANAN_TOOLCHAIN_DIR/Toolchain.txt \ + --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ -DCMAKE_INSTALL_PREFIX=/usr \ || exit 1 }