Skip to content

Commit 2186bca

Browse files
Explicitly enable std=c++20 as there's too many elderly compilers around.
Link to dynamic libecolab.
1 parent 5502092 commit 2186bca

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ include include/Makefile
3434
#binary
3535
FLAGS+=-UECOLAB_LIB -DINSTALLED_ECOLAB_LIB=\"$(PREFIX)/include\" -DWORDSIZE=64
3636

37-
ifdef AEGIS
37+
#ifdef AEGIS
3838
# must build and test against c++20 now
3939
CXXFLAGS+=-std=c++20
40-
endif
40+
#endif
4141

4242
# when upgrading MXE, this will need to be removed
4343
ifdef MXE
@@ -236,7 +236,7 @@ latex-docs:
236236
if which latex; then cd doc; rm -f *.aux *.dvi *.log *.blg *.toc *.lof *.out; latex -interaction=batchmode ecolab; fi
237237

238238
#bin/ecolab is a python interpreter supporting MPI
239-
bin/ecolab$(ECOLIBS_EXT): src/pythonMain.o lib/libecolab$(ECOLIBS_EXT).a
239+
bin/ecolab$(ECOLIBS_EXT): src/pythonMain.o lib/libecolab$(ECOLIBS_EXT).so
240240
$(LINK) $(FLAGS) src/pythonMain.o -Wl,-rpath $(ECOLAB_HOME)/lib $(LIBS) -lboost_system -o $@
241241
-find . \( -name "*.cc" -o -name "*.h" \) -print |etags -
242242

0 commit comments

Comments
 (0)