looks like shell expansion doesn't work with cirrus-ci, lets do it another way

pull/459/head
bradh352 3 years ago
parent 876d5ac77e
commit 75163d5289
  1. 7
      .cirrus.yml
  2. 13
      ci/build.sh

@ -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

@ -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

Loading…
Cancel
Save