Changeset 792


Ignore:
Timestamp:
Nov 28, 2007 8:48:43 PM (12 years ago)
Author:
lou
Message:

Update to incorporate fpsetprec64.s for Solaris x86 64-bit build.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/trunk/compile_Unix_ASL.in

    r781 r792  
    5656fi
    5757
    58 # System-specific tweaks.
    59 # On Solaris x86, we need to build fpsetprec.s. Add it to the dependency list
    60 # for amplsolver.a
    61 # In the original configure.ac, there was a case here that adjusted the
    62 # makefile.u rule that builds details.c from details.c0. We've done that
    63 # above. Also, the edit rule in the original configure.ac didn't match the
    64 # text in makefile.u. So I'm going to leave it out and see what breaks.
    65 # -- lh, 071019 --
     58# System-specific tweaks.  On Solaris x86, we need to build fpsetprec.s
     59# (fpsetprec64.s for 64-bit builds). Add it to the dependency list for
     60# amplsolver.a. The 64-bit question here is how to reliably recognise a 64-bit
     61# build. For GCC, -m64 should do it. For Sun Studio, it's more difficult.
     62# Studio 12 and later recognises -m64. Earlier versions require
     63# -xarch=<something>, where something can be any of generic64, native64, amd64,
     64# or amd64a (and perhaps others). So ... let's go out on a limb and hope that
     65# -xarch=*64* will not pick up anything it shouldn't. Force leading and
     66# trailing spaces in the string we're matching, in case the 64-bit flag is the
     67# only content in CFLAGS.
    6668
    6769case "@build@" in
    6870  *86-*-solaris*)
    69     sed -e 's/^amplsolver.a:/amplsolver.a: fpsetprec.s/' \
    70       < makefile.coin > makefile.coin.tmp
     71    case " @CFLAGS@ " in
     72      *" "-m64" "* | *" "-xarch=*64*" "*)
     73        sed -e 's/^amplsolver.a:/amplsolver.a: fpsetprec64.s/' \
     74          < makefile.coin > makefile.coin.tmp
     75        ;;
     76      *)
     77        sed -e 's/^amplsolver.a:/amplsolver.a: fpsetprec.s/' \
     78          < makefile.coin > makefile.coin.tmp
     79        ;;
     80    esac
    7181    mv makefile.coin.tmp makefile.coin
    7282    ;;
Note: See TracChangeset for help on using the changeset viewer.