Changeset 2034


Ignore:
Timestamp:
Dec 31, 2010 6:49:38 AM (9 years ago)
Author:
stefan
Message:

merge chgset 2033 from trunk

Location:
stable/0.6
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • stable/0.6

    • Property svn:mergeinfo changed
      /trunkmerged: 2033

  • stable/0.6/coin.m4

    r1999 r2034  
    566566             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    567567  *-darwin*) comps="g++ c++ CC" ;;
     568  *-linux-gnu*)
     569             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
    568570          *) comps="xlC_r aCC CC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    569571esac
    … …  
    986988             fi
    987989             ;;
     990  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    988991  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    989992  *)         comps="xlc_r xlc cc gcc pgcc icc" ;;
    … …  
    15081511  *-*-solaris*)
    15091512     coin_f77_comps="f95 f90 f77 xlf_r fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;
     1513  *-linux-gnu*)
     1514     coin_f77_comps="gfortran fort77 f77 g77 pgf90 pgf77 ifort ifc frt af77 xlf_r" ;;
    15101515  *) coin_f77_comps="xlf_r fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;;
    15111516 esac

  • stable/0.6/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.