Changeset 594
- Timestamp:
- Oct 6, 2007 9:52:22 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/coin.m4
r519 r594 508 508 509 509 save_cxxflags="$CXXFLAGS" 510 # For sparc-sun-solaris, promote Studio/Workshop compiler to front of list.510 # For *-*-solaris*, promote Studio/Workshop compiler to front of list. 511 511 case $build in 512 512 *-cygwin* | *-mingw*) … … 516 516 comps="g++ cl" 517 517 fi ;; 518 sparc-sun-solaris*)518 *-*-solaris*) 519 519 comps="CC xlC aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;; 520 520 *-darwin*) comps="g++ c++ CC" ;; … … 636 636 esac 637 637 ;; 638 *- sun-*)638 *-*-solaris*) 639 639 coin_opt_cxxflags="-O4" 640 640 coin_dbg_cxxflags="-g" … … 779 779 CXXLIBS="-L/opt/aCC/lib -l++ -lstd_v2 -lCsup_v2 -lm -lcl -lc" 780 780 ;; 781 *- sun-*)781 *-*-solaris*) 782 782 CXXLIBS="-lCstd -lCrun" 783 783 esac … … 880 880 881 881 save_cflags="$CFLAGS" 882 # For sparc-sun-solaris, promote Studio/Workshop compiler to front of list.882 # For *-*-solaris*, promote Studio/Workshop compiler to front of list. 883 883 # ToDo: If Studio/Workshop cc is not present, we may find /usr/ucb/cc, which 884 884 # is likely to be a non-functional shell. But many installations will have … … 891 891 comps="gcc cl" 892 892 fi ;; 893 sparc-sun-solaris*)893 *-*-solaris*) 894 894 comps="cc xlc gcc pgcc icc" ;; 895 895 *-linux-*) comps="xlc gcc cc pgcc icc" ;; … … 992 992 coin_dbg_cflags="-g" 993 993 ;; 994 *- sun-*)994 *-*-solaris*) 995 995 coin_opt_cflags="-xO4" 996 996 coin_dbg_cflags="-g" … … 1208 1208 coin_dbg_fflags="-C -g" 1209 1209 ;; 1210 *- sun-*)1210 *-*-solaris*) 1211 1211 coin_opt_fflags="-O4" 1212 1212 coin_dbg_fflags="-g" … … 1381 1381 # Auxilliary macro to make sure both COIN_PROG_F77 and COIN_FIND_F77 use 1382 1382 # the same search lists for compiler names. 1383 # For sparc-sun-solaris, promote Studio/Workshop compilers to front of list.1383 # For *-*-solaris*, promote Studio/Workshop compilers to front of list. 1384 1384 AC_DEFUN([AC_COIN_F77_COMPS], 1385 1385 [case $build in … … 1390 1390 coin_f77_comps="gfortran g77 ifort fl32 compile_f2c" 1391 1391 fi ;; 1392 sparc-sun-solaris*)1392 *-*-solaris*) 1393 1393 coin_f77_comps="f95 f90 f77 xlf fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;; 1394 1394 *) coin_f77_comps="xlf fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;; … … 1935 1935 *-mingw32) 1936 1936 RPATH_FLAGS=nothing ;; 1937 *- sun-*)1937 *-*-solaris*) 1938 1938 RPATH_FLAGS= 1939 1939 for dir in $1; do … … 2761 2761 SAVE_LIBS="$LIBS"]) 2762 2762 ;; 2763 *-sun-*) 2763 2764 # Ideally, we'd use -library=sunperf, but it's an imperfect world. Studio 2765 # cc doesn't recognise -library, it wants -xlic_lib. Studio 12 CC doesn't 2766 # recognise -xlic_lib. Libtool doesn't like -xlic_lib anyway. Sun claims 2767 # that CC and cc will understand -library in Studio 13. The main extra 2768 # function of -xlic_lib and -library is to arrange for the Fortran run-time 2769 # libraries to be linked for C++ and C. We can arrange that explicitly. 2770 *-*-solaris*) 2764 2771 SAVE_LIBS="$LIBS" 2765 AC_MSG_CHECKING([ whether -xlic_lib=sunperf has BLAS])2766 LIBS="- xlic_lib=sunperf$LIBS"2772 AC_MSG_CHECKING([for BLAS in libsunperf]) 2773 LIBS="-lsunperf $FLIBS $LIBS" 2767 2774 AC_COIN_TRY_FLINK([daxpy], 2768 2775 [AC_MSG_RESULT([yes]) 2769 use_blas='-xlic_lib=sunperf' 2770 ADDLIBS="-xlic_lib=sunperf $ADDLIBS"], 2776 use_blas='-lsunperf' 2777 ADDLIBS="-lsunperf $ADDLIBS" 2778 coin_need_flibs=yes], 2771 2779 [AC_MSG_RESULT([no]) 2772 2780 LIBS="$SAVE_LIBS"]) … … 2882 2890 SAVE_LIBS="$LIBS"]) 2883 2891 ;; 2884 *-sun-*) 2885 SAVE_LIBS="$LIBS" 2886 AC_MSG_CHECKING([whether -xlic_lib=sunperf has LAPACK]) 2887 LIBS="-xlic_lib=sunperf $LIBS" 2888 AC_COIN_TRY_FLINK([dsyev], 2889 [AC_MSG_RESULT([yes]) 2890 use_lapack='-xlic_lib=sunperf' 2891 ADDLIBS="-xlic_lib=sunperf $ADDLIBS"], 2892 [AC_MSG_RESULT([no]) 2893 LIBS="$SAVE_LIBS"]) 2892 2893 # See comments in COIN_HAS_BLAS. 2894 *-*-solaris*) 2895 SAVE_LIBS="$LIBS" 2896 AC_MSG_CHECKING([for LAPACK in libsunperf]) 2897 LIBS="-lsunperf $FLIBS $LIBS" 2898 AC_COIN_TRY_FLINK([dsyev], 2899 [AC_MSG_RESULT([yes]) 2900 use_blas='-lsunperf' 2901 ADDLIBS="-lsunperf $ADDLIBS" 2902 coin_need_flibs=yes], 2903 [AC_MSG_RESULT([no]) 2904 LIBS="$SAVE_LIBS"]) 2894 2905 ;; 2895 2906 # On cygwin, do this check only if doscompile is disabled. The prebuilt library
Note: See TracChangeset
for help on using the changeset viewer.