diff --git a/racket/src/README b/racket/src/README index 5ad29ffd9a..0f20b393a6 100644 --- a/racket/src/README +++ b/racket/src/README @@ -311,8 +311,7 @@ As an example of cross-compiling, to compile for Android on ARM using the NDK, use (all on one line) configure --host=arm-linux-androideabi - CPPFLAGS=-I[ndk]/platforms/android-[N]/arch-arm/usr/include - LDFLAGS=-L[ndk]/platforms/android-[N]/arch-arm/usr/lib + --enable-sysroot="[ndk]/platforms/android-[N]/arch-arm" --enable-sgc --enable-racket=racket diff --git a/racket/src/configure b/racket/src/configure index 0a58631de4..ab1d1f3048 100755 --- a/racket/src/configure +++ b/racket/src/configure @@ -1449,6 +1449,7 @@ Optional Features: --enable-sdk= use Mac OS X 10.4 SDK directory --enable-sdk5= use Mac OS X 10.5 SDK directory --enable-sdk6= use Mac OS X 10.6 SDK directory + --enable-sysroot= use sysroot directory (e.g., for Android) --enable-xonx use Unix style (e.g., use Gtk) for Mac OS X --enable-libfw install Mac OS X frameworks to /Library/Frameworks --enable-userfw install Mac OS X frameworks to ~/Library/Frameworks @@ -2696,6 +2697,11 @@ if test "${enable_sdk+set}" = set; then : enableval=$enable_sdk; fi +# Check whether --enable-sdk was given. +if test "${enable_sdk+set}" = set; then : + enableval=$enable_sdk; +fi + # Check whether --enable-xonx was given. if test "${enable_xonx+set}" = set; then : enableval=$enable_xonx; @@ -3047,6 +3053,10 @@ if test "${enable_sdk6}" != "" ; then echo "=== Using Mac OS X 10.6 SDK directory ${enable_sdk6}" fi +if test "${enable_sysroot}" != "" ; then + echo "=== Using sysroot directory ${enable_sysroot}" +fi + if test "${enable_racket}" != "" ; then echo "=== Using Racket executable ${enable_racket}" fi @@ -3193,6 +3203,14 @@ ORIG_CPP="${CPP}" # Include `--enable-portable-binary' by default for libffi SUB_CONFIGURE_EXTRAS=" --enable-portable-binary" +if test "${enable_sysroot}" != "" ; then + PREFLAGS="--sysroot=${enable_sysroot} ${PREFLAGS}" + CPPFLAGS="--sysroot=${enable_sysroot} ${CPPFLAGS}" + LDFLAGS="--sysroot=${enable_sysroot} ${LDFLAGS}" + SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPFLAGS="'"'"${PREFLAGS}"'"' + SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"' +fi + if test "${enable_oskit}" = "no" ; then ac_ext=c ac_cpp='$CPP $CPPFLAGS' diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac index 9f7fd76ea0..07777def6a 100644 --- a/racket/src/racket/configure.ac +++ b/racket/src/racket/configure.ac @@ -58,6 +58,7 @@ AC_ARG_ENABLE(libffi, [ --enable-libffi use installed libffi (enabled AC_ARG_ENABLE(sdk, [ --enable-sdk= use Mac OS X 10.4 SDK directory]) AC_ARG_ENABLE(sdk, [ --enable-sdk5= use Mac OS X 10.5 SDK directory]) AC_ARG_ENABLE(sdk, [ --enable-sdk6= use Mac OS X 10.6 SDK directory]) +AC_ARG_ENABLE(sdk, [ --enable-sysroot= use sysroot directory (e.g., for Android)]) AC_ARG_ENABLE(xonx, [ --enable-xonx use Unix style (e.g., use Gtk) for Mac OS X]) AC_ARG_ENABLE(libfw, [ --enable-libfw install Mac OS X frameworks to /Library/Frameworks]) AC_ARG_ENABLE(libfw, [ --enable-userfw install Mac OS X frameworks to ~/Library/Frameworks]) @@ -343,6 +344,10 @@ if test "${enable_sdk6}" != "" ; then echo "=== Using Mac OS X 10.6 SDK directory ${enable_sdk6}" fi +if test "${enable_sysroot}" != "" ; then + echo "=== Using sysroot directory ${enable_sysroot}" +fi + if test "${enable_racket}" != "" ; then echo "=== Using Racket executable ${enable_racket}" fi @@ -483,6 +488,14 @@ ORIG_CPP="${CPP}" # Include `--enable-portable-binary' by default for libffi SUB_CONFIGURE_EXTRAS=" --enable-portable-binary" +if test "${enable_sysroot}" != "" ; then + PREFLAGS="--sysroot=${enable_sysroot} ${PREFLAGS}" + CPPFLAGS="--sysroot=${enable_sysroot} ${CPPFLAGS}" + LDFLAGS="--sysroot=${enable_sysroot} ${LDFLAGS}" + SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPFLAGS="'"'"${PREFLAGS}"'"' + SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"' +fi + if test "${enable_oskit}" = "no" ; then AC_PROG_CC AC_PROG_CPP