Changeset 3246

Timestamp:

Aug 5, 2010 6:27:20 AM (14 years ago)

Author:

bennylp

Message:

Re #1068 (misc): fixed error in cross compiling Mingw on a Linux box (thanks Atik Khan for the report)

Location:

pjproject/trunk

Files:

• aconfigure (modified) (2 diffs)
• aconfigure.ac (modified) (2 diffs)

pjproject/trunk/aconfigure

@@ -3432 +3432 @@
 
 
+if test -z "$CROSS_COMPILE"; then
+    CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
+fi
+
 if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
 
@@ -3461 +3465 @@
 
 
-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
         ;;
     *)

pjproject/trunk/aconfigure.ac

@@ -41 +41 @@
 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
@@ -71 +78 @@
 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
         ;;
     *)