Changeset 4049


Ignore:
Timestamp:
Jan 9, 2020 11:08:11 PM (5 months ago)
Author:
stefan
Message:

add MUMPS_CFLAGS to CFLAGS, rerun autotools

Location:
ThirdParty/Mumps/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/trunk/Makefile.am

    r4025 r4049  
    7474CLEANFILES = *.mod
    7575
    76 CFLAGS += $(MY_DEFS)
     76CFLAGS += $(MY_DEFS) $(MUMPS_CFLAGS)
    7777FCFLAGS += $(MY_FDEFS)
    7878
  • ThirdParty/Mumps/trunk/Makefile.in

    r4025 r4049  
    275275CC = @CC@
    276276CCDEPMODE = @CCDEPMODE@
    277 CFLAGS = @CFLAGS@ $(MY_DEFS)
     277CFLAGS = @CFLAGS@ $(MY_DEFS) $(MUMPS_CFLAGS)
    278278COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    279279CPP = @CPP@
  • ThirdParty/Mumps/trunk/configure

    r4025 r4049  
    33793379
    33803380  # If enable-msvc, then test for Intel (on Windows) and MS C compiler
    3381   # explicitly and add compile-wrapper before AC_PROG_CC, because
    3382   # the compile-wrapper work around issues when having the wrong link.exe
    3383   # in the PATH first, which would upset tests in AC_PROG_CC.
    3384   # Further, if CC unset and not set by user, then stop with error.
     3381  # explicitly and add the compile wrapper before AC_PROG_CC. The compile
     3382  # wrapper works around issues related to finding MS link.exe. (Unix link.exe
     3383  # occurs first in PATH, which causes compile and link checks to fail.) For
     3384  # the same reason, set LD to use the compile wrapper. If CC remains unset
     3385  # (neither icl or cl was found, and CC was not set by the user), stop with
     3386  # an error.
     3387
    33853388  if test $enable_msvc = yes ; then
    33863389    for ac_prog in icl cl
     
    34283431    if test -n "$CC" ; then
    34293432      CC="$am_aux_dir/compile $CC"
     3433      ac_cv_prog_CC="$CC"
     3434      LD="$CC"
    34303435    else
    34313436      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     
    34333438  fi
    34343439
    3435   # look for some C compiler and check whether it works
    3436   # if user has set CC or we found icl/cl above, this shouldn't overwrite CC
    3437   # other than CXX of F77, this macro also takes care of adding the compile-wrapper
     3440  # Look for some C compiler and check that it works. If the user has set CC
     3441  # or we found icl/cl above, this shouldn't overwrite CC. Unlike the macros
     3442  # that establish C++ or Fortran compilers, PROG_CC also takes care of adding
     3443  # the compile wrapper if needed.
     3444
    34383445  ac_ext=c
    34393446ac_cpp='$CPP $CPPFLAGS'
     
    1598915996#    regarding those that are properly marked for dll-export in the source.
    1599015997#
    15991 # Patch libtool also to circumbent some issues when using MinGW (Msys+GCC).
     15998# Patch libtool also to circumvent some issues when using MinGW (Msys+GCC).
    1599215999# 1. Relax check which libraries can be used when linking a DLL.
    1599316000#    libtool's func_mode_link() would reject linking MinGW system libraries,
Note: See TracChangeset for help on using the changeset viewer.