From 75163d528968238c949cbe3ecc076ecb9918ff41 Mon Sep 17 00:00:00 2001
From: bradh352 <brad@brad-house.com>
Date: Mon, 20 Dec 2021 17:15:02 -0500
Subject: [PATCH] looks like shell expansion doesn't work with cirrus-ci, lets
 do it another way

---
 .cirrus.yml |  7 +++----
 ci/build.sh | 13 +++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index f0c71f9d..537ab983 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -46,9 +46,8 @@ task:
       env:
         DIST: "iOS"
         MAKE: "make"
-        SYSROOT: "$(xcode-select -print-path)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/"
-        CMAKE_FLAGS: "-DCMAKE_BUILD_TYPE=DEBUG -DCARES_STATIC=ON -DCARES_STATIC_PIC=ON -DCARES_BUILD_TESTS=OFF -DCMAKE_C_FLAGS=-miphoneos-version-min=10.0 -DCMAKE_CXX_FLAGS=-miphoneos-version-min=10.0 -DCMAKE_OSX_SYSROOT=$SYSROOT -DCMAKE_OSX_ARCHITECTURES=armv7;armv7s;arm64"
-        CFLAGS: "-isysroot $SYSROOT -arch armv7 -arch armv7s -arch arm64 -miphoneos-version-min=10.0"
+        CMAKE_FLAGS: "-DCMAKE_BUILD_TYPE=DEBUG -DCARES_STATIC=ON -DCARES_STATIC_PIC=ON -DCARES_BUILD_TESTS=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.0 -DCMAKE_OSX_ARCHITECTURES=armv7;armv7s;arm64"
+        CFLAGS: "-arch armv7 -arch armv7s -arch arm64 -miphoneos-version-min=10.0"
         CONFIG_OPTS: "--host=arm-apple-darwin10 --disable-tests"
       macos_instance:
         image: big-sur-xcode
@@ -148,7 +147,7 @@ task:
               ;;
           esac
           ;;
-        MACOS)
+        MACOS|IOS)
           brew update && \
           brew install ninja cmake
           case "${BUILD_TYPE}" in
diff --git a/ci/build.sh b/ci/build.sh
index 9f42da84..bf0bc926 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -8,16 +8,29 @@ elif [ "$CIRRUS_OS" != "" ]; then
     OS="$CIRRUS_OS"
 fi
 
+if [ "$DIST" = "iOS" ] ; then
+   XCODE_PATH=`xcode-select -print-path`
+   SYSROOT="${XCODE_PATH}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/"
+fi
+
 if [ "$BUILD_TYPE" != "cmake" -a "$BUILD_TYPE" != "valgrind" ]; then
     autoreconf -fi
     mkdir atoolsbld
     cd atoolsbld
+    if [ "$DIST" = "iOS" ] ; then
+        export CFLAGS="${CFLAGS} -isysroot ${SYSROOT}"
+        export CXXFLAGS="${CXXFLAGS} -isysroot ${SYSROOT}"
+        export LDFLAGS="${LDFLAGS} -isysroot ${SYSROOT}"
+    fi
     $SCAN_WRAP ../configure --disable-symbol-hiding --enable-expose-statics --enable-maintainer-mode --enable-debug $CONFIG_OPTS
     $SCAN_WRAP make
 else
     # Use cmake for valgrind to prevent libtool script wrapping of tests that interfere with valgrind
     mkdir cmakebld
     cd cmakebld
+    if [ "$DIST" = "iOS" ] ; then
+        CMAKE_FLAGS="${CMAKE_FLAGS} -DCMAKE_OSX_SYSROOT=${SYSROOT}"
+    fi
     cmake ${CMAKE_FLAGS} ..
     make
 fi