Changeset 3005


Ignore:
Timestamp:
Oct 24, 2013 6:50:33 AM (6 years ago)
Author:
stefan
Message:

merge r3003 and r3004 from trunk

Location:
stable/0.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r3002 r3005  
    221221
    222222# This macro is included by any PROG_compiler macro, to set the LD
    223 # environment variable on MinGW to the correct value (link). But note that
    224 # if we're building in cygwin with -mno-cygwin, we still want ld! If we're
     223# environment variable on MinGW to the correct value (link). If we're
    225224# building from cygwin with MSVC tools (cl/link), then we do want link and
    226225# you'd better have your PATH variable straight, else you'll be doing file
    227 # links instead of code links! Arguably, LDFLAGS should include -mno-cygwin
    228 # but in practice all linking seems to be handled through the compilers, so
    229 # CFLAGS and CXXFLAGS suffice.
     226# links instead of code links!
    230227
    231228AC_DEFUN([AC_COIN_MINGW_LD_FIX],
     
    530527fi
    531528
    532 # If CXXFLAGS contains -mno-cygwin, CPPFLAGS must also have it.
    533 
    534 case "$CXXFLAGS" in
    535   *-mno-cygwin*)
    536     if test x${CPPFLAGS+set} != xset ; then
    537       CPPFLAGS="-mno-cygwin"
    538     else
    539       case "$CPPFLAGS" in
    540         *-mno-cygwin*)
    541           ;;
    542         *)
    543           CPPFLAGS="$CPPFLAGS -mno-cygwin"
    544           ;;
    545       esac
    546     fi ;;
    547 esac
    548 
    549529# add -DPROJECT_BUILD to signal compiler preprocessor which config header file to include
    550530if test x$COIN_PRJCT != x; then
     
    930910  fi
    931911fi
    932 
    933 # If CFLAGS contains -mno-cygwin, CPPFLAGS must also have it.
    934 
    935 case "$CFLAGS" in
    936   *-mno-cygwin*)
    937     if test x${CPPFLAGS+set} != xset ; then
    938       CPPFLAGS="-mno-cygwin"
    939     else
    940       case "$CPPFLAGS" in
    941         *-mno-cygwin*)
    942           ;;
    943         *)
    944           CPPFLAGS="$CPPFLAGS -mno-cygwin"
    945           ;;
    946       esac
    947     fi ;;
    948 esac
    949912
    950913# add -DPROJECT_BUILD to signal compiler preprocessor which config header file to include
     
    11541117fi
    11551118
    1156 # If FFLAGS contains -mno-cygwin, CPPFLAGS must have it.
    1157 case "$FFLAGS" in
    1158   *-mno-cygwin*)
    1159     if test x${CPPFLAGS+set} != xset ; then
    1160       CPPFLAGS="-mno-cygwin"
    1161     else
    1162       case "$CPPFLAGS" in
    1163         *-mno-cygwin*)
    1164           ;;
    1165         *)
    1166           CPPFLAGS="$CPPFLAGS -mno-cygwin"
    1167           ;;
    1168       esac
    1169     fi ;;
    1170 esac
    1171 
    11721119# Try if FFLAGS works
    11731120if test "$F77" != "unavailable" ; then
     
    12311178        -lcrt*.o) ;;
    12321179        -lcygwin) ;;
     1180        -lgcc*)   ;;
    12331181               *) my_flibs="$my_flibs $flag" ;;
    12341182      esac
Note: See TracChangeset for help on using the changeset viewer.