Skip to content
This repository was archived by the owner on Mar 4, 2021. It is now read-only.

Commit 638391e

Browse files
committed
iOS: invoke configure directly in script
It seems this is a simpler strategy for invoking the configure script for iOS. Well, that's the theory. Now, let's see whether this also works in practice.
1 parent 193ba3b commit 638391e

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
bin_SCRIPTS = cross-ios
1+
bin_SCRIPTS = cross-configure-ios

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AC_INIT([cross], [0.1.0])
2-
AC_CONFIG_SRCDIR([cross-ios])
1+
AC_INIT([cross], [0.2.0])
2+
AC_CONFIG_SRCDIR([cross-configure-ios])
33
AM_INIT_AUTOMAKE([foreign])
44
AC_PROG_INSTALL
55
AC_CONFIG_FILES([Makefile])

cross-ios renamed to cross-configure-ios

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33
if [ $# -lt 1 ]; then
4-
echo "$0 i386|x86_64|armv7s|arm64 [command [args...]]" 1>&2
4+
echo "$0 i386|x86_64|armv7s|arm64 [args...]" 1>&2
55
exit 1
66
fi
77
PKG_ARCH=$1
@@ -35,11 +35,4 @@ export CPPFLAGS="-arch ${PKG_ARCH} -isysroot $(xcrun -sdk ${PLATFORM} --show-sdk
3535
export CFLAGS="-O2 -arch ${PKG_ARCH} $MINVERSION -isysroot $(xcrun -sdk ${PLATFORM} --show-sdk-path) $CFLAGS"
3636
export CXXFLAGS="-O2 -arch ${PKG_ARCH} $MINVERSION -isysroot $(xcrun -sdk ${PLATFORM} --show-sdk-path) $CXXFLAGS"
3737
export LDFLAGS="-arch ${PKG_ARCH} $MINVERSION -isysroot $(xcrun -sdk ${PLATFORM} --show-sdk-path) $LDFLAGS"
38-
export PKG_CONFIGUREFLAGS
39-
export PKG_OS="ios"
40-
export PKG_ARCH
41-
if [ $# -gt 0 ]; then
42-
$@
43-
else
44-
env
45-
fi
38+
./configure $PKG_CONFIGUREFLAGS $@

0 commit comments

Comments
 (0)