Ticket #42016: patch-make.include.diff

File patch-make.include.diff, 1.8 KB (added by jwhowse4, 11 years ago)

patch file which worked

  • make.include

    old new  
    66#   the defaults below should work, although fast BLAS and LAPACK recommended.
    77
    88# STEP 2: Set the name of the C compiler.
    9 CC       = gcc
     9CC       = @@MP_CC@@
    1010#CC       = cc
    1111#CC       = g++
    1212#CC       = mpicc
     
    3232#DSDPTIMER  = DSDP_MS_TIME
    3333
    3434# STEP 3c: Add other compiler flags.
    35 DSDPCFLAGS =
     35DSDPCFLAGS = -DDSDP_TIME -I/usr/include/sys
    3636#DSDPCFLAGS = -Wall
    3737#DSDPCFLAGS = -DDSDPMATLAB
    3838#  Other flags concern BLAS and LAPACK libraries -- see next step.
     
    4343
    4444
    4545# STEP 4.  Set Linker and FLAGS:  Link the DSDP library to application
    46 CFLAGS   = ${OPTFLAGS} -I. -I${DSDPROOT}/include ${DSDPCFLAGS}
    47 CLINKER = ${CC} ${OPTFLAGS}
     46CFLAGS   = ${OPTFLAGS} @@MP_ARCHFLAGS@@ -I. -I${DSDPROOT}/include ${DSDPCFLAGS}
     47CLINKER = ${CC} ${OPTFLAGS} @@MP_ARCHFLAGS@@
    4848#CLINKER        = ${CXX} ${OPTFLAGS} -static
    4949#CLINKER        = link /out:dsdp5.exe
    5050
     
    5555# Not needed to compile library or matlab executable
    5656# Needed to link DSDP library to the driver ( read SDPA files, maxcut example, ...)
    5757# Also include the math library and other libraries needed to link the BLAS to the C files that call them.
    58 LAPACKBLAS  = -llapack -lblas -lg2c -lm
     58LAPACKBLAS  = -lm -L@@PREFIX@@/lib -llapack -lcblas -lf77blas -latlas -L@@PREFIX@@/lib/gcc48 -lgfortran
    5959#LAPACKBLAS  = -L/usr/lib/ -llapack -lblas -lg2c -lm
    6060#LAPACKBLAS  = -L/home/benson/ATLAS/Linux_P4SSE2/lib -llapack -lcblas -lf77blas -latlas -lg2c -lm
    6161#LAPACKBLAS  = -L/sandbox/benson/ATLAS-3.6/lib/Linux_P4SSE2  -llapack -lcblas -lf77blas -latlas -lg2c -lm
     
    6363
    6464
    6565# STEP 6, MATLAB MACROS - If compiling Matlab interface, check MEX flag.
    66 MEX           = mex -O
     66MEX           = mkoctfile --mex
    6767#MEX     = C:\Matlab\bin\mex
    6868DSDPMATLABDIR = ${DSDPROOT}/matlab
    6969