diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff2857b..9fd292e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,12 +97,18 @@ jobs: name: pongo path: payloads/ - - name : Download embedded artifacts + - name: Download embedded artifacts uses: actions/download-artifact@v4 with: name: embedded path: payloads/ + - name: Download musl toolchain + run: | + curl -u ${{ secrets.ACTIONS_RESOURCES_LOGIN }} -LO https://static.palera.in/action-resources/musl-cross/${{ matrix.triple }}-cross.tar.zst + tar --zstd -xf ${{ matrix.triple }}-cross.tar.zst + echo "$(pwd)/${{ matrix.triple }}-cross/bin" >> $GITHUB_PATH + - name: Install dependencies (apt) run: | sudo apt update @@ -110,7 +116,7 @@ jobs: - name: Build run: | - make palera1n WITH_STATIC=1 BUILD_TYPE=Release + make palera1n WITH_STATIC=1 BUILD_TYPE=Release CMAKE_SYSROOT="$("$PWD/${{ matrix.triple }}-cross/bin/${{ matrix.triple }}-gcc" -print-sysroot)" - name: Upload uses: actions/upload-artifact@v4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cf792d..3997d57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,10 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) if(MINGW) set(DEPS_PREFIX /mingw64) +elseif(CMAKE_SYSROOT) + set(DEPS_PREFIX "${CMAKE_SYSROOT}") else() - set(DEPS_PREFIX ${CMAKE_BINARY_DIR}/deps) + set(DEPS_PREFIX "${CMAKE_BINARY_DIR}/deps") endif() # ========================= diff --git a/Makefile b/Makefile index e33e21d..8a50a3c 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ WITH_TUI ?= 0 WITH_ARTIFACTS ?= 1 WITH_STATIC ?= 0 BUILD_TYPE ?= Debug +CMAKE_SYSROOT ?= payloads: mkdir -p src/gen/images @@ -34,6 +35,7 @@ payloads: palera1n: payloads @cmake -S . -B build \ + -DCMAKE_SYSROOT="$(CMAKE_SYSROOT)" \ -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ -DWITH_GUI=$(WITH_GUI) \ -DWITH_TUI=$(WITH_TUI) \ @@ -44,6 +46,7 @@ palera1n: payloads palera1n_xcode: payloads @cmake -S . -B build \ -G Xcode \ + -DCMAKE_SYSROOT="$(CMAKE_SYSROOT)" \ -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ -DWITH_GUI=$(WITH_GUI) \ -DWITH_TUI=$(WITH_TUI) \ @@ -53,6 +56,7 @@ palera1n_xcode: payloads palera1n_mingw: payloads @cmake -S . -B build \ -G "MinGW Makefiles" \ + -DCMAKE_SYSROOT="$(CMAKE_SYSROOT)" \ -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ -DWITH_GUI=$(WITH_GUI) \ -DWITH_TUI=$(WITH_TUI) \