Changeset 3191


Ignore:
Timestamp:
Mar 8, 2014 8:39:14 AM (7 years ago)
Author:
stefan
Message:

set LD to link iff using MS/Intel compiler on Windows

  • get rid of AC_COIN_MINGW_LD_FIX macro
File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7/coin.m4

    r3116 r3191  
    215215 
    216216]) # AC_COIN_DEBUG_COMPILE
    217 
    218 ###########################################################################
    219 #                          COIN_MINGW_LD_FIX                              #
    220 ###########################################################################
    221 
    222 # This macro is included by any PROG_compiler macro, to set the LD
    223 # environment variable on MinGW to the correct value (link). If we're
    224 # building from cygwin with MSVC tools (cl/link), then we do want link and
    225 # you'd better have your PATH variable straight, else you'll be doing file
    226 # links instead of code links!
    227 
    228 AC_DEFUN([AC_COIN_MINGW_LD_FIX],
    229 [AC_REQUIRE([AC_COIN_ENABLE_MSVC])
    230  case $build in
    231   *-mingw*)
    232     if test "${LD+set}" = set; then :; else
    233       LD=link
    234     fi
    235     ;;
    236  esac
    237  if test $enable_msvc = yes ; then
    238    if test "x${LD+set}" = xset; then :; else
    239      LD=link
    240    fi
    241  fi
    242 ])
    243217
    244218###########################################################################
     
    559533fi
    560534
    561 # correct the LD variable in a mingw build with MS or intel compiler
     535# correct the LD variable in a build with MS or intel compiler
    562536case "$CXX" in
    563537  clang* ) ;;
    564538  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    565     AC_COIN_MINGW_LD_FIX
     539    LD=link
    566540    ;;
    567541esac
     
    700674
    701675AC_DEFUN([AC_COIN_PROG_CC],
    702 [AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
    703 AC_REQUIRE([AC_COIN_ENABLE_MSVC])
     676[AC_REQUIRE([AC_COIN_ENABLE_MSVC])
    704677AC_LANG_PUSH(C)
    705678
     
    958931  clang* ) ;;
    959932  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    960     AC_COIN_MINGW_LD_FIX
     933    LD=link
    961934    ;;
    962935esac
     
    974947
    975948AC_DEFUN([AC_COIN_PROG_F77],
    976 [AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
    977 AC_REQUIRE([AC_COIN_ENABLE_MSVC])
     949[AC_REQUIRE([AC_COIN_ENABLE_MSVC])
    978950AC_REQUIRE([AC_COIN_PROG_CC])
    979951AC_REQUIRE([AC_COIN_F77_COMPS])
     
    11591131case "$F77" in
    11601132  ifort* | */ifort* | IFORT* | */IFORT*)
    1161     AC_COIN_MINGW_LD_FIX
     1133    LD=link
    11621134    ;;
    11631135esac
Note: See TracChangeset for help on using the changeset viewer.