interfect/tildefriends
1
0
Fork 0
forked from cory/tildefriends
Code Pull Requests Activity

build: Minor cleanup and a disappointing workaround for iOS cross-compiling toolchain issues I don't understand.

Browse Source
This commit is contained in:
Cory McWilliams 2025-02-01 16:24:31 -05:00
parent 0c181d7e7c
commit f0c1a8f98f
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GNUmakefile
View File

@ -246,8 +246,8 @@ $(IOS_TARGETS): CC = xcrun --sdk iphoneos clang -isysroot $(IOS_SYSROOT) -arch a
$(IOSSIM_TARGETS): IOSSIM_SYSROOT := $(shell xcrun --sdk iphonesimulator --show-sdk-path) $(IOSSIM_TARGETS): IOSSIM_SYSROOT := $(shell xcrun --sdk iphonesimulator --show-sdk-path)
$(IOSSIM_TARGETS): CC = xcrun --sdk iphonesimulator clang -isysroot $(IOSSIM_SYSROOT) -arch x86_64 $(IOSSIM_TARGETS): CC = xcrun --sdk iphonesimulator clang -isysroot $(IOSSIM_SYSROOT) -arch x86_64
else ifeq ($(UNAME_S),Linux) else ifeq ($(UNAME_S),Linux)
$(IOS_TARGETS): CFLAGS += -isysroot deps/ios_toolchain/target/SDKs/iPhoneOS18.2.sdk -arch arm64 $(IOS_TARGETS): CFLAGS += -isysroot deps/ios_toolchain/target/SDK/iPhoneOS18.2.sdk -arch arm64 -DTARGET_OS_IPHONE=1
$(IOS_TARGETS): LDFLAGS += -isysroot deps/ios_toolchain/target/SDKs/iPhoneOS18.2.sdk $(IOS_TARGETS): LDFLAGS += -isysroot deps/ios_toolchain/target/SDK/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 deps/ios_toolchain/target/bin/arm-apple-darwin11-clang
endif endif
$(ANDROID_X86_64_TARGETS): ANDROID_NDK_TARGET_TRIPLE := x86_64-linux-android $(ANDROID_X86_64_TARGETS): ANDROID_NDK_TARGET_TRIPLE := x86_64-linux-android

4
src/ssb.tests.c
View File

@ -18,6 +18,10 @@
#include "sodium/crypto_sign.h" #include "sodium/crypto_sign.h"
#if defined(__APPLE__)
#include <TargetConditionals.h>
#endif
#if !defined(_WIN32) #if !defined(_WIN32)
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif

5
src/task.c
View File

@ -40,6 +40,10 @@
#define WEXITSTATUS(x) (x) #define WEXITSTATUS(x) (x)
#endif #endif
#if defined(__APPLE__)
#include <TargetConditionals.h>
#endif
#if !defined(__APPLE__) && !defined(__OpenBSD__) #if !defined(__APPLE__) && !defined(__OpenBSD__)
#include <malloc.h> #include <malloc.h>
#endif #endif
@ -726,7 +730,6 @@ static JSValue _tf_task_platform(JSContext* context, JSValueConst this_val, int
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
return JS_NewString(context, "android"); return JS_NewString(context, "android");
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <TargetConditionals.h>
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
return JS_NewString(context, "iphone"); return JS_NewString(context, "iphone");
#else #else