Changeset 2767


Ignore:
Timestamp:
Jun 8, 2013 7:28:59 AM (7 years ago)
Author:
stefan
Message:

compiler flags may be determined before deciding on shared or static (fix for previous commit)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r2766 r2767  
    426426          cl* | */cl* | CL* | */CL*)
    427427            # The MT and MTd options are mutually exclusive
    428             if test "$coin_disable_shared" = yes ; then
     428            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
    429429               coin_opt_cxxflags='-MD -O2'
    430430               coin_dbg_cxxflags='-MDd'
     
    437437          icl* | */icl* | ICL* | */ICL*)
    438438          # The MT and MTd options are mutually exclusive
    439             if test "$coin_disable_shared" = yes ; then
     439            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
    440440              coin_opt_cxxflags='-MD -Ox'
    441441              coin_dbg_cxxflags='-MDd -debug'
     
    914914          clang* ) ;;
    915915          cl* | */cl* | CL* | */CL*)
    916             if test "$coin_disable_shared" = yes ; then
     916            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
    917917              coin_opt_cflags='-MD -O2'
    918918              coin_dbg_cflags='-MDd'
     
    924924            ;;
    925925          icl* | */icl* | ICL* | */ICL*)
    926             if test "$coin_disable_shared" = yes ; then
     926            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
    927927              coin_opt_cflags='-MD -Ox'
    928928              coin_dbg_cflags='-MDd -debug'
     
    11761176        case $F77 in
    11771177          ifort* | */ifort* | IFORT* | */IFORT* )
    1178             if test "$coin_disable_shared" = yes ; then
     1178            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
    11791179              coin_opt_fflags='-MD -O3'
    11801180              coin_dbg_fflags='-MDd -debug'
     
    11861186          ;;
    11871187          compile_f2c*)
    1188             if test "$coin_disable_shared" = yes ; then
     1188            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
    11891189              coin_opt_fflags='-MD -O2'
    11901190              coin_dbg_fflags='-MDd'
Note: See TracChangeset for help on using the changeset viewer.