From 264f16dcf6a7ed57340a9cc19dc9d5c22aa2572e Mon Sep 17 00:00:00 2001 From: "Denny C. Dai" Date: Tue, 22 Mar 2022 12:11:26 -0700 Subject: [PATCH] process,iOS: fix build breakage in process.c (#3563) Remove the `TARGET_OS_IPHONE` ifdef to include posix spawn headers for iOS build. Previously https://github.com/libuv/libuv/pull/3257 introduced posix spawn with \_\_APPLE\_\_ platform only, which resulted in a number of spawn related definitions not found for iOS (such as `uv__posix_spawn_fncs_tag`). Co-authored-by: Jameson Nash --- .github/workflows/CI-unix.yml | 6 +++--- src/unix/process.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI-unix.yml b/.github/workflows/CI-unix.yml index aa2589c7..506c00bc 100644 --- a/.github/workflows/CI-unix.yml +++ b/.github/workflows/CI-unix.yml @@ -30,6 +30,7 @@ jobs: - name: Build android arm64 run: | $ANDROID_HOME/cmake/3.10.2.4988404/bin/cmake --build build + ls -lh build build-macos: runs-on: macos-10.15 @@ -69,10 +70,9 @@ jobs: cd build-ios cmake .. -GXcode -DCMAKE_SYSTEM_NAME:STRING=iOS -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED:BOOL=NO -DCMAKE_CONFIGURATION_TYPES:STRING=Release - name: Build - continue-on-error: true # XXX: allow failure run: | cmake --build build-ios - ls -lh + ls -lh build-ios build-cross-qemu: runs-on: ubuntu-latest @@ -123,7 +123,7 @@ jobs: - name: Build run: | cmake --build build - ls -lh + ls -lh build - name: Test run: | ${{ matrix.config.qemu }} build/uv_run_tests_a diff --git a/src/unix/process.c b/src/unix/process.c index c8816b85..16ba6c87 100644 --- a/src/unix/process.c +++ b/src/unix/process.c @@ -35,7 +35,7 @@ #include #include -#if defined(__APPLE__) && !TARGET_OS_IPHONE +#if defined(__APPLE__) # include # include # include