From 4a8c68d9e0bd07731cf874279048ea41a655d582 Mon Sep 17 00:00:00 2001 From: Paul McCarthy <pauldmccarthy@gmail.com> Date: Fri, 26 Nov 2021 14:30:40 +0000 Subject: [PATCH] RF: Work around issue with c++17 and older versions of libxml++. Easier to define here rather than in every project which uses ciftilib (which in turn uses libxml++) --- config/buildSettings.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/buildSettings.mk b/config/buildSettings.mk index 450bc75..2bff6c1 100644 --- a/config/buildSettings.mk +++ b/config/buildSettings.mk @@ -114,6 +114,13 @@ ifeq ($(SYSTYPE), Darwin) LDFLAGS += -Wl,-rpath,"${FSLDIR}/lib" ARCHLIBS += -llapack -lblas -lz -lm + # Old versions of libxml++ (which is used by + # ciftilib) use std::auto_ptr, which has been + # removed from the llvm C++17 implementation. + # Adding this flag is a hack which allows us + # to continue to use std::auto_ptr. + ARCHCPPFLAGS += -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR + # On macOS, we need to change the install # name of shared libs so that they can be # looked up according to the rpath of -- GitLab