Skip to content

Commit

Permalink
workflows: use clang installation stdlib as include
Browse files Browse the repository at this point in the history
  • Loading branch information
bwrsandman committed Feb 9, 2025
1 parent b3017c6 commit 779ee0a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/reassemble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: robinraju/release-downloader@v1
with:
repository: 'openblack/llvm-project'
tag: 'bw1-decomp-004'
tag: 'bw1-decomp-006'
fileName: 'llvm-${{ matrix.os }}.zip'
extract: true
out-file-path: 'llvm'
Expand All @@ -39,15 +39,24 @@ jobs:
if: ${{ runner.os != 'Windows' }}
run: chmod -R +x llvm/bin

- if: ${{ runner.os == 'Windows' }}
run: |
C:/msys64/usr/bin/pacman -Sy --noconfirm mingw-w64-clang-x86_64-headers-git
- if: ${{ runner.os != 'Windows' }}
run: |
sudo apt install -y mingw-w64 libc6-dev-i386-cross
- name: Set path for LLVM binaries in env
shell: bash
run: |
echo "LLVM_BINARIES=$(echo '${{ github.workspace }}'/llvm/bin | sed 's,\\,/,g')" >> $GITHUB_ENV
echo "CLANG_INCLUDE=$(echo '${{ github.workspace }}/llvm/lib/clang/20/include;/usr/i686-w64-mingw32/include' | sed 's,\\,/,g')" >> $GITHUB_ENV
echo "LLVM_SUFFIX=${{ runner.os == 'Windows' && '.exe' || '' }}" >> $GITHUB_ENV
- name: Build bw1-decomp project
run: |
cmake -G Ninja -Ssrc -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_ASM_COMPILER="${{env.LLVM_BINARIES}}/clang${{env.LLVM_SUFFIX}}" -DCMAKE_RC_COMPILER="${{env.LLVM_BINARIES}}/llvm-rc${{env.LLVM_SUFFIX}}" -DCMAKE_LINKER="${{env.LLVM_BINARIES}}/lld${{env.LLVM_SUFFIX}}"
cmake -G Ninja -Ssrc -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_ASM_COMPILER="${{env.LLVM_BINARIES}}/clang${{env.LLVM_SUFFIX}}" -DCMAKE_RC_COMPILER="${{env.LLVM_BINARIES}}/llvm-rc${{env.LLVM_SUFFIX}}" -DCMAKE_LINKER="${{env.LLVM_BINARIES}}/lld${{env.LLVM_SUFFIX}}" -DCMAKE_C_STANDARD_INCLUDE_DIRECTORIES="${{env.CLANG_INCLUDE}}"
cmake --build build
- name: Verify MD5 sum of resulting binary
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ target_link_options(runblack-reassembled
)
target_include_directories(runblack-reassembled
PRIVATE
C:/msys64/clang64/include
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../black
Expand Down

0 comments on commit 779ee0a

Please sign in to comment.