Changeset 3246


Ignore:
Timestamp:
Aug 5, 2010 6:27:20 AM (9 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:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r3205 r3246  
    34323432 
    34333433 
     3434if test -z "$CROSS_COMPILE"; then 
     3435    CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'` 
     3436fi 
     3437 
    34343438if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi 
    34353439 
     
    34613465 
    34623466 
    3463 case $target in 
     3467 
     3468case $host in 
    34643469    *mingw* | *cygw* | *win32* | *w32* ) 
    3465         ac_pjdir=`pwd -W` 
     3470        if pwd -W 2&> /dev/null; then 
     3471           ac_pjdir=`pwd -W` 
     3472        else 
     3473           # We're probably cross-compiling mingw on Linux 
     3474           ac_pjdir=`pwd` 
     3475        fi 
    34663476        ;; 
    34673477    *) 
  • pjproject/trunk/aconfigure.ac

    r3205 r3246  
    4141AC_PROG_CXX 
    4242AC_LANG_C 
     43 
     44dnl # 
     45dnl # Setup CROSS_COMPILE variable 
     46dnl # 
     47if test -z "$CROSS_COMPILE"; then  
     48    CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'` 
     49fi 
    4350 
    4451if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi 
     
    7178AC_SUBST(ac_pjdir) 
    7279AC_SUBST(ac_build_mak_vars) 
    73 case $target in  
     80 
     81case $host in  
    7482    *mingw* | *cygw* | *win32* | *w32* ) 
    75         ac_pjdir=`pwd -W` 
     83        if pwd -W 2&> /dev/null; then 
     84           ac_pjdir=`pwd -W` 
     85        else 
     86           # We're probably cross-compiling mingw on Linux 
     87           ac_pjdir=`pwd` 
     88        fi 
    7689        ;; 
    7790    *) 
Note: See TracChangeset for help on using the changeset viewer.