Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include.mk
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ifdef DISABLE_JEMALLOC
endif

CFLAGS += -I ${sonLibPath} -I ${halPath} -I ${halIncPath}
CXXFLAGS += -std=c++14 -I ${sonLibPath} -I ${halPath} -I ${halIncPath} -I ${libbdsgPath}/include -UNDEBUG
CXXFLAGS += -std=c++20 -I ${sonLibPath} -I ${halPath} -I ${halIncPath} -I ${libbdsgPath}/include -UNDEBUG
basicLibs = ${halPath}/libHal.a ${sonLibPath}/stPinchesAndCacti.a ${sonLibPath}/sonLib.a ${sonLibPath}/cuTest.a ${libbdsgPath}/lib/libbdsg.a ${libbdsgPath}/lib/libhandlegraph.a ${libbdsgPath}/lib/libsdsl.a ${libbdsgPath}/lib/libdivsufsort.a ${libbdsgPath}/lib/libdivsufsort64.a
ifeq (${jemalloc},on)
basicLibs += ${jemallocPath}/lib/libjemalloc.a
Expand All @@ -46,7 +46,7 @@ basicLibsDependencies := ${basicLibs}
# hal's hdf5Filters.cpp implements custom HDF5 lz4/zstd codecs, so libHal.a now
# carries LZ4_/ZSTD_ references. h5c++'s wrapper config doesn't pull these in,
# so every binary linking libHal.a needs them spelled out.
basicLibs += -llz4 -lzstd
basicLibs += -llz4 -lzstd -ljansson

# hdf5 compilation is done through its wrappers.
# we can speficy our own (sonlib) compilers with these variables:
Expand Down