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

Commit

Permalink
iOS: invoke configure directly in script
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bassosimone committed May 29, 2019
1 parent 193ba3b commit 638391e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bin_SCRIPTS = cross-ios
bin_SCRIPTS = cross-configure-ios
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_INIT([cross], [0.1.0])
AC_CONFIG_SRCDIR([cross-ios])
AC_INIT([cross], [0.2.0])
AC_CONFIG_SRCDIR([cross-configure-ios])
AM_INIT_AUTOMAKE([foreign])
AC_PROG_INSTALL
AC_CONFIG_FILES([Makefile])
Expand Down
11 changes: 2 additions & 9 deletions cross-ios → cross-configure-ios
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
set -e
if [ $# -lt 1 ]; then
echo "$0 i386|x86_64|armv7s|arm64 [command [args...]]" 1>&2
echo "$0 i386|x86_64|armv7s|arm64 [args...]" 1>&2
exit 1
fi
PKG_ARCH=$1
Expand Down Expand Up @@ -35,11 +35,4 @@ export CPPFLAGS="-arch ${PKG_ARCH} -isysroot $(xcrun -sdk ${PLATFORM} --show-sdk
export CFLAGS="-O2 -arch ${PKG_ARCH} $MINVERSION -isysroot $(xcrun -sdk ${PLATFORM} --show-sdk-path) $CFLAGS"
export CXXFLAGS="-O2 -arch ${PKG_ARCH} $MINVERSION -isysroot $(xcrun -sdk ${PLATFORM} --show-sdk-path) $CXXFLAGS"
export LDFLAGS="-arch ${PKG_ARCH} $MINVERSION -isysroot $(xcrun -sdk ${PLATFORM} --show-sdk-path) $LDFLAGS"
export PKG_CONFIGUREFLAGS
export PKG_OS="ios"
export PKG_ARCH
if [ $# -gt 0 ]; then
$@
else
env
fi
./configure $PKG_CONFIGUREFLAGS $@

0 comments on commit 638391e

Please sign in to comment.