From b696afd87ff698c5a9344e8f0ab5e2ffbf3808ed Mon Sep 17 00:00:00 2001 From: such-gitea Date: Wed, 11 Feb 2026 16:30:21 -0500 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 1111b33..88ab2c8 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,4 +1,4 @@ -name: Build Wownero LWS (Mac Final Fix) +name: Build Wownero LWS (Mac Deep Fix) on: push: branches: [ master, main ] @@ -11,7 +11,7 @@ env: jobs: # ================================================================== - # JOB 1: LINUX NATIVE (x86_64) - WORKING + # JOB 1: LINUX NATIVE (x86_64) - WORKING (UNTOUCHED) # ================================================================== linux-native: runs-on: ubuntu-latest @@ -104,7 +104,7 @@ jobs: path: release/*.tar.gz # ================================================================== - # JOB 2: LINUX CROSS (ARM64 / RISCV64) - WORKING + # JOB 2: LINUX CROSS (ARM64 / RISCV64) - WORKING (UNTOUCHED) # ================================================================== linux-cross: runs-on: ubuntu-latest @@ -164,13 +164,12 @@ jobs: - name: Patch Boost Context (Aarch64) if: matrix.target == 'aarch64-linux-gnu' run: | - echo "Downloading and compiling missing Boost Context ASM for aarch64..." mkdir -p boost_asm && cd boost_asm BASE="https://raw.githubusercontent.com/boostorg/context/develop/src/asm" curl -f -O $BASE/jump_arm64_aapcs_elf_gas.S curl -f -O $BASE/make_arm64_aapcs_elf_gas.S curl -f -O $BASE/ontop_arm64_aapcs_elf_gas.S - if [ ! -s jump_arm64_aapcs_elf_gas.S ]; then echo "FATAL: Empty file downloaded"; exit 1; fi + if [ ! -s jump_arm64_aapcs_elf_gas.S ]; then echo "FATAL: Empty file"; exit 1; fi aarch64-linux-gnu-gcc -c jump_arm64_aapcs_elf_gas.S -o jump.o aarch64-linux-gnu-gcc -c make_arm64_aapcs_elf_gas.S -o make.o aarch64-linux-gnu-gcc -c ontop_arm64_aapcs_elf_gas.S -o ontop.o @@ -247,7 +246,7 @@ jobs: # ... # ================================================================== - # JOB 4: MACOS - RT & JIT FIX + # JOB 4: MACOS - RT REMOVAL + ARCH FIX # ================================================================== macos: runs-on: macos-latest @@ -259,9 +258,11 @@ jobs: include: - target: x86_64-apple-darwin11 arch: x86_64 + build_arch: x86-64 platform: macos-x64 - target: aarch64-apple-darwin11 arch: arm64 + build_arch: armv8-a platform: macos-arm64 steps: - name: Manual Checkout @@ -282,6 +283,11 @@ jobs: perl -pi -e 's/handler_loop\s+final/handler_loop/g' src/rest_server.cpp perl -pi -e 's/find_library\(ICU/# find_library(ICU/g' external/monero/CMakeLists.txt perl -pi -e 's/locale//g' external/monero/CMakeLists.txt + + # FIX 1: Physically delete any reference to 'rt' in the CMake file + # macOS doesn't have it, and even checking for it can confuse things. + perl -pi -e 's/rt //g' CMakeLists.txt + perl -pi -e 's/RT_LIBRARY//g' CMakeLists.txt - name: Install CMake run: brew install cmake @@ -298,13 +304,14 @@ jobs: mkdir build && cd build SDK_DIR="$(pwd)/../wownero-sdk" - # FIX 1: Explicitly set system processor so CMake knows target arch - # FIX 2: Explicitly set RT_LIBRARY to empty string to kill the -lrt link error + # FIX 2: Added -DARCH=${{ matrix.build_arch }} to force correct JIT target + # FIX 3: Added -DRT_LIBRARY="" just in case cmake .. -DCMAKE_BUILD_TYPE=Release \ -DBUILD_STATIC=ON \ -DBoost_USE_STATIC_RUNTIME=OFF \ -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \ -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }} \ + -DARCH=${{ matrix.build_arch }} \ -DCMAKE_PREFIX_PATH="$SDK_DIR" \ -DBOOST_ROOT="$SDK_DIR" \ -DOPENSSL_ROOT_DIR="$SDK_DIR" \