Skip to content

Commit 92b9132

Browse files
committed
fixing sundials
1 parent 8c4e644 commit 92b9132

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

make/compiler_flags

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ endif
314314

315315
CXXFLAGS += $(CXXFLAGS_LANG) $(CXXFLAGS_OS) $(CXXFLAGS_WARNINGS) $(CXXFLAGS_BOOST) $(CXXFLAGS_EIGEN) $(CXXFLAGS_OPENCL) $(CXXFLAGS_MPI) $(CXXFLAGS_THREADS) $(CXXFLAGS_TBB) $(CXXFLAGS_FLTO) $(CXXFLAGS_OPTIM) $(CXXFLAGS_NO_RANGE_CHECKS) -O$(O) $(INC)
316316
CPPFLAGS += $(CPPFLAGS_LANG) $(CPPFLAGS_OS) $(CPPFLAGS_WARNINGS) $(CPPFLAGS_BOOST) $(CPPFLAGS_EIGEN) $(CPPFLAGS_OPENCL) $(CPPFLAGS_TBB) $(CPPFLAGS_MPI) $(CPPFLAGS_TBB) $(CPPFLAGS_FLTO) $(CPPFLAGS_OPTIM) $(CXXFLAGS_NO_RANGE_CHECKS)
317-
LDFLAGS += $(LDFLAGS_LANG) $(LDFLAGS_OS) $(LDFLAGS_WARNINGS) $(LDFLAGS_BOOST) $(LDFLAGS_EIGEN) $(LDFLAGS_OPENCL) $(LDFLAGS_MPI) $(LDFLAGS_TBB) $(LDFLAGS_FLTO) $(LDFLAGS_OPTIM)
318-
LDLIBS += $(LDLIBS_LANG) $(LDLIBS_OS) $(LDLIBS_WARNINGS) $(LDLIBS_BOOST) $(LDLIBS_EIGEN) $(LDLIBS_OPENCL) $(LDLIBS_MPI) $(LDLIBS_TBB)
317+
LDFLAGS += $(LDFLAGS_LANG) $(LDFLAGS_OS) $(LDFLAGS_WARNINGS) $(LDFLAGS_EIGEN) $(LDFLAGS_BOOST) $(LDFLAGS_SUNDIALS) $(LDFLAGS_TBB) $(LDFLAGS_OPENCL) $(LDFLAGS_MPI) $(LDFLAGS_FLTO) $(LDFLAGS_OPTIM)
318+
LDLIBS += $(LDLIBS_LANG) $(LDLIBS_OS) $(LDLIBS_WARNINGS) $(LDLIBS_EIGEN) $(LDLIBS_BOOST) $(LDLIBS_SUNDIALS) $(LDLIBS_TBB) $(LDLIBS_OPENCL) $(LDLIBS_MPI)
319319

320320
.PHONY: print-compiler-flags
321321
print-compiler-flags:
@@ -354,8 +354,9 @@ print-compiler-flags:
354354
@echo ' LDLIBS:'
355355
@echo ' - LDLIBS_LANG ' $(LDLIBS_LANG)
356356
@echo ' - LDLIBS_WARNINGS ' $(LDLIBS_WARNINGS)
357-
@echo ' - LDLIBS_BOOST ' $(LDLIBS_BOOST)
358357
@echo ' - LDLIBS_EIGEN ' $(LDLIBS_EIGEN)
358+
@echo ' - LDLIBS_BOOST ' $(LDLIBS_BOOST)
359+
@echo ' - LDLIBS_SUNDIALS ' $(LDLIBS_SUNDIALS)
359360
@echo ' - LDLIBS_OS ' $(LDLIBS_OS)
360361
@echo ' - LDLIBS_GTEST ' $(LDLIBS_GTEST)
361362
@echo ' - LDLIBS_OPENCL ' $(LDLIBS_OPENCL)
@@ -364,8 +365,9 @@ print-compiler-flags:
364365
@echo ' LDFLAGS:'
365366
@echo ' - LDFLAGS_LANG ' $(LDFLAGS_LANG)
366367
@echo ' - LDFLAGS_WARNINGS ' $(LDFLAGS_WARNINGS)
367-
@echo ' - LDFLAGS_BOOST ' $(LDFLAGS_BOOST)
368368
@echo ' - LDFLAGS_EIGEN ' $(LDFLAGS_EIGEN)
369+
@echo ' - LDFLAGS_BOOST ' $(LDFLAGS_BOOST)
370+
@echo ' - LDFLAGS_SUNDIALS ' $(LDFLAGS_SUNDIALS)
369371
@echo ' - LDFLAGS_OS ' $(LDFLAGS_OS)
370372
@echo ' - LDFLAGS_GTEST ' $(LDFLAGS_GTEST)
371373
@echo ' - LDFLAGS_OPENCL ' $(LDFLAGS_OPENCL)

make/libraries

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ $(SUNDIALS)/lib/libsundials_nvecserial.a: $(SUNDIALS_NVECSERIAL)
7979
@mkdir -p $(dir $@)
8080
$(AR) -rs $@ $^
8181

82-
LIBSUNDIALS := $(SUNDIALS)/lib/libsundials_nvecserial.a $(SUNDIALS)/lib/libsundials_cvodes.a $(SUNDIALS)/lib/libsundials_idas.a $(SUNDIALS)/lib/libsundials_kinsol.a
82+
LIBSUNDIALS ?= $(SUNDIALS)/lib/libsundials_nvecserial.a $(SUNDIALS)/lib/libsundials_cvodes.a $(SUNDIALS)/lib/libsundials_idas.a $(SUNDIALS)/lib/libsundials_kinsol.a
8383

8484
STAN_SUNDIALS_HEADERS := $(call findfiles,$(MATH)stan,*cvodes*.hpp) $(call findfiles,$(MATH)stan,*idas*.hpp) $(call findfiles,$(MATH)stan,*kinsol*.hpp)
8585
$(STAN_SUNDIALS_HEADERS) : $(LIBSUNDIALS)

0 commit comments

Comments
 (0)