Changeset 26627

Show
Ignore:
Timestamp:
09.01.2013 14:33:19 (7 years ago)
Author:
davidb
Message:

Support for cross-compiling added

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/cascade-make/trunk/lib/cascade-lib.bash

    r24689 r26627  
    1111    GSDLOS=windows 
    1212  fi 
     13  if test ! -z $crossOS ; then 
     14    # Override derived value with value explicitly provided in crossOS 
     15    GSDLOS=$crossOS 
     16  fi 
     17 
    1318  echo "GSDLOS was not set.  Setting it to '$GSDLOS'" 
    1419  export GSDLOS 
     
    2328    eval exthome=`echo \\$$ext` 
    2429    if test -z "$exthome" ; then 
    25       echo "Environment variable $ext for Greenstone extension not set" 
    26       echo "Sourcing $reldir/setup.bash" 
    27       source $reldir/setup.bash 
    28  
    29       eval exthome=`echo \\$$ext` 
     30      if test -f $reldir/setup.bash ; then 
     31        echo "Environment variable $ext for Greenstone extension not set" 
     32        echo "Sourcing $reldir/setup.bash" 
     33        source $reldir/setup.bash 
     34       
     35        eval exthome=`echo \\$$ext` 
     36      else 
     37     echo "Did not detect $reldir/setup.bash, Skipping" 
     38      fi 
    3039    fi 
    3140  fi 
     
    158167    echo "[pushd $package$version]" 
    159168    ( cd $package$version ; \ 
    160       echo ./configure --prefix="$prefix" $CROSSCOMPILE $@ ; \ 
    161       ./configure --prefix="$prefix" $CROSSCOMPILE $@ ) 
     169      echo $CROSSCONFIGURE_VARS ./configure --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ ;  
     170      eval $CROSSCONFIGURE_VARS ./configure --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ ) 
    162171    if [ $? != 0 ] ; then 
    163172        echo "      Error encountered running *configure* stage of $progname" 
     
    288297    force_config=1 
    289298  fi 
    290  
    291 fi 
     299fi