diff options
| -rwxr-xr-x | aconfigure | 14 | ||||
| -rw-r--r-- | aconfigure.ac | 17 |
2 files changed, 27 insertions, 4 deletions
@@ -3431,6 +3431,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -z "$CROSS_COMPILE"; then + CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'` +fi + if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi if test "$LD" = ""; then LD="$CC"; fi @@ -3460,9 +3464,15 @@ if test "$CC_CFLAGS" = ""; then CC_CFLAGS="-Wall"; fi -case $target in + +case $host in *mingw* | *cygw* | *win32* | *w32* ) - ac_pjdir=`pwd -W` + if pwd -W 2&> /dev/null; then + ac_pjdir=`pwd -W` + else + # We're probably cross-compiling mingw on Linux + ac_pjdir=`pwd` + fi ;; *) ac_pjdir=`pwd` diff --git a/aconfigure.ac b/aconfigure.ac index 4e54ade8..cfc03e24 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -41,6 +41,13 @@ AC_PROG_CC AC_PROG_CXX AC_LANG_C +dnl # +dnl # Setup CROSS_COMPILE variable +dnl # +if test -z "$CROSS_COMPILE"; then + CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'` +fi + if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi AC_SUBST(AR) if test "$LD" = ""; then LD="$CC"; fi @@ -70,9 +77,15 @@ AC_SUBST(CC_CFLAGS) AC_SUBST(ac_pjdir) AC_SUBST(ac_build_mak_vars) -case $target in + +case $host in *mingw* | *cygw* | *win32* | *w32* ) - ac_pjdir=`pwd -W` + if pwd -W 2&> /dev/null; then + ac_pjdir=`pwd -W` + else + # We're probably cross-compiling mingw on Linux + ac_pjdir=`pwd` + fi ;; *) ac_pjdir=`pwd` |