From 32920e0e5df8763b56ae1a5ac5741784d7674c35 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Sat, 1 Feb 2025 17:58:51 -0500 Subject: [PATCH] build: Still trying to get ios to build on this worker. --- .gitea/workflows/build.yaml | 2 +- GNUmakefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 50ea838a..b9247716 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -30,7 +30,7 @@ jobs: uses: android-actions/setup-android@v3 with: packages: 'tools platform-tools build-tools;34.0.0 platforms;android-34 ndk;26.3.11579264' - - run: ANDROID_SDK=$HOME/.android/sdk make -j`nproc` all dist docs + - run: ANDROID_SDK=$HOME/.android/sdk make -j`nproc` iosdebug docs - run: docker build . - uses: actions/upload-artifact@v3 with: diff --git a/GNUmakefile b/GNUmakefile index c5bd1a4a..3c346d43 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -248,7 +248,7 @@ $(IOSSIM_TARGETS): CC = xcrun --sdk iphonesimulator clang -isysroot $(IOSSIM_SYS else ifeq ($(UNAME_S),Linux) $(IOS_TARGETS): CFLAGS += -isysroot deps/ios_toolchain/target/SDKs/iPhoneOS18.2.sdk -arch arm64 -DTARGET_OS_IPHONE=1 $(IOS_TARGETS): LDFLAGS += -isysroot deps/ios_toolchain/target/SDKs/iPhoneOS18.2.sdk -$(IOS_TARGETS): CC = PATH=$$PATH:deps/ios_toolchain/target/bin deps/ios_toolchain/target/bin/arm-apple-darwin11-clang +$(IOS_TARGETS): CC = PATH=$$PATH:deps/ios_toolchain/target/bin LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:deps/ios_toolchain/target/lib deps/ios_toolchain/target/bin/arm-apple-darwin11-clang endif $(ANDROID_X86_64_TARGETS): ANDROID_NDK_TARGET_TRIPLE := x86_64-linux-android $(ANDROID_X86_TARGETS): ANDROID_NDK_TARGET_TRIPLE := i686-linux-android