Changeset 332


Ignore:
Timestamp:
Jun 11, 2007 12:06:26 AM (13 years ago)
Author:
andreasw
Message:

some fixes for MSys

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r325 r332  
    17961796  # Correct cygpath for minGW (ToDo!)
    17971797  AC_MSG_NOTICE([Build is "$build".])
     1798  mydos2unix='| dos2unix'
    17981799  case $build in
    17991800    *-mingw*)
    18001801      CYGPATH_W=echo
     1802      mydos2unix=
    18011803      ;;
    18021804  esac
     
    18221824            -e 's%lib /OUT:%lib -OUT:%' \
    18231825            -e "s%cygpath -w%$CYGPATH_W%" \
    1824             -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo | dos2unix\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
     1826            -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
    18251827            -e 's/$AR t/lib -nologo -list/' \
    18261828            -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
  • trunk/compile_f2c/compile_f2c

    r330 r332  
    2020########################################################################
    2121
     22#Find out what the
     23if test `which cygpath | wc -l` -eq 0; then
     24  CYGPATH_W=echo
     25else
     26  CYGPATH_W='cygpath -w'
     27fi
    2228
    23 f2clib=`cygpath -w $f2clibdir/vcf2c.lib`
    24 mainobj=`cygpath -w $f2clibdir/main.obj`
     29if test "$F2C_CC" = ""; then
     30  F2C_CC=cl
     31fi
     32
     33f2clib=`$CYGPATH_W $f2clibdir/vcf2c.lib`
     34mainobj=`$CYGPATH_W $f2clibdir/main.obj`
    2535
    2636# Get rid of the \
     
    2838mainobj=`echo $mainobj | sed -e s'!\\\\!/!g'`
    2939
    30 if test "$CC" = ""; then
    31   CC=cl
    32 fi
    3340
    3441if test "$#" -eq 1 && test "$1" = "-FLIBS"; then
     
    3744fi
    3845
    39 cincs=-I`cygpath -w $f2clibdir`
     46cincs="-I`$CYGPATH_W $f2clibdir`"
    4047
    4148options=
     
    8996if test "$fsrc" != ""; then
    9097  for f in $fsrc; do
    91     cf=`echo $f | sed -e 's|.[fF]$|.c|'`
     98    cf=`echo $f | sed -e 's|.[fF]$|.c|' -e 's|.*/||'`
    9299    csrc="$csrc $cf"
    93100  done
    94101
     102  echo f2c $incs $fsrc
    95103  f2c $incs $fsrc
    96104  f2c_status=$?
     
    101109fi
    102110
     111
    103112if test "$outfile"; then
    104   cout="-o `cygpath -w $outfile`"
     113  cout="-o `$CYGPATH_W $outfile`"
    105114fi
    106115
    107 echo $CC $options $cincs $csrc $objs $cout $mainobj $f2clib
     116echo $F2C_CC $options $cincs $csrc $objs $cout $mainobj $f2clib
    108117
    109 $CC $options $cincs $csrc $objs $cout $mainobj $f2clib
     118$F2C_CC $options $cincs $csrc $objs $cout $mainobj $f2clib
    110119cl_status=$?
    111120
Note: See TracChangeset for help on using the changeset viewer.