Commit 6b87e692 authored by Christopher Subich's avatar Christopher Subich
Browse files

Re-ordered makefile libraries, putting fftw first

On systems using the MKL library, including the MKL (via $(LAPACK_LIB))
brings in the MKL fftw-wrapper bindings, rather than fftw itself.  This
is problematic on account of the fact that the MKL fftw wrapper doesn't
implement the parts of the library that SPINS actually uses; this leads
to an assertion failure on startup.
parent 54ec97e6
......@@ -36,11 +36,11 @@ ifeq ($(OPTIM),true)
endif
endif
INCLUDE_DIRS := $(MPI_INCDIR) $(LAPACK_INCDIR) $(BLITZ_INCDIR) $(FFTW_INCDIR) $(UMF_INCDIR) -I../include
INCLUDE_DIRS := -I../include $(MPI_INCDIR) $(LAPACK_INCDIR) $(BLITZ_INCDIR) $(FFTW_INCDIR) $(UMF_INCDIR)
CFLAGS := $(CFLAGS) $(INCLUDE_DIRS)
LIB_DIRS := $(MPI_LIBDIR) $(LAPACK_LIBDIR) $(BLITZ_LIBDIR) $(FFTW_LIBDIR) $(UMF_LIBDIR) -L../lib
LDLIBS := $(MPI_LIB) $(LAPACK_LIB) -lfftw3 -lblitz -lm -lstdc++ -lumfpack -lamd
LIB_DIRS := -L../lib $(MPI_LIBDIR) $(LAPACK_LIBDIR) $(BLITZ_LIBDIR) $(FFTW_LIBDIR) $(UMF_LIBDIR)
LDLIBS := -lfftw3 $(MPI_LIB) $(LAPACK_LIB) -lblitz -lm -lstdc++ -lumfpack -lamd
LDFLAGS := $(LDFLAGS) $(LIB_DIRS)
.PHONY: all
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment