diff --git a/.github/workflows/build-fex.yml b/.github/workflows/build-fex.yml index 43a6b50434..f6724e7c8b 100644 --- a/.github/workflows/build-fex.yml +++ b/.github/workflows/build-fex.yml @@ -14,6 +14,10 @@ on: description: 'Release tag to publish as (e.g. fex-2609-r1); empty = artifact only' required: false default: '' + cxxflags: + description: 'Extra CXXFLAGS for a diagnostic build (e.g. -DDEBUG_STRACE); never published with a tag' + required: false + default: '' permissions: contents: write @@ -27,7 +31,7 @@ jobs: - name: Build in Arch Linux ARM run: | set -euo pipefail - docker run --rm -v "$PWD:/work" -w /work menci/archlinuxarm:base-devel bash tools/fex/build-in-arch.sh + docker run --rm -e FEX_EXTRA_CXXFLAGS="${{ inputs.cxxflags }}" -v "$PWD:/work" -w /work menci/archlinuxarm:base-devel bash tools/fex/build-in-arch.sh sudo chown -R "$(id -u):$(id -g)" . - uses: actions/upload-artifact@v4 with: @@ -38,7 +42,7 @@ jobs: fex-needed.txt fex-files.txt - name: Publish - if: github.event_name == 'workflow_dispatch' && inputs.tag != '' + if: github.event_name == 'workflow_dispatch' && inputs.tag != '' && inputs.cxxflags == '' env: GH_TOKEN: ${{ github.token }} run: | diff --git a/tools/fex/build-in-arch.sh b/tools/fex/build-in-arch.sh index 2e5d9cff3c..af13b65904 100755 --- a/tools/fex/build-in-arch.sh +++ b/tools/fex/build-in-arch.sh @@ -24,7 +24,8 @@ cmake -S fex-src -B fex-build -G Ninja \ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUSE_LINKER=lld \ -DTUNE_CPU=none -DTUNE_ARCH=armv8-a \ -DBUILD_TESTING=OFF -DBUILD_THUNKS=OFF -DBUILD_FEXCONFIG=OFF -DENABLE_ASSERTIONS=OFF \ - -DENABLE_CCACHE=OFF -DENABLE_OFFLINE_TELEMETRY=OFF + -DENABLE_CCACHE=OFF -DENABLE_OFFLINE_TELEMETRY=OFF \ + ${FEX_EXTRA_CXXFLAGS:+-DCMAKE_CXX_FLAGS="$FEX_EXTRA_CXXFLAGS"} ninja -C fex-build DESTDIR="$WORK/out" ninja -C fex-build install install -Dm755 /usr/bin/unsquashfs out/usr/local/bin/unsquashfs