diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4cf44f..3f65218 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,7 +102,7 @@ jobs: secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang" - flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" + flags: "-Os -fPIE" options: "--enable-isystem" packager: "brew" packages: "llvm@16 icu4c" @@ -120,7 +120,7 @@ jobs: secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang" - flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" + flags: "-Os -fvisibility=hidden -fPIE" options: "--enable-isystem" packager: "brew" packages: "llvm@16 icu4c" @@ -380,7 +380,7 @@ jobs: secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang" - flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" + flags: "-Os -fPIE" options: "" packager: "brew" packages: "llvm@16 icu4c" @@ -398,7 +398,7 @@ jobs: secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang" - flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" + flags: "-Os -fvisibility=hidden -fPIE" options: "" packager: "brew" packages: "llvm@16 icu4c" diff --git a/builds/msvc/vs2022/libbitcoin-system.import.props b/builds/msvc/vs2022/libbitcoin-system.import.props index 390dc00..bb11eeb 100644 --- a/builds/msvc/vs2022/libbitcoin-system.import.props +++ b/builds/msvc/vs2022/libbitcoin-system.import.props @@ -51,8 +51,7 @@ WITH_ICU;WIN32_LEAN_AND_MEAN;NOMINMAX;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) BC_STATIC;%(PreprocessorDefinitions) - - + _CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) WITH_AVX512;%(PreprocessorDefinitions) WITH_AVX2;%(PreprocessorDefinitions) diff --git a/install-cmake.sh b/install-cmake.sh index 3f59ae4..bf2ca50 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -332,6 +332,11 @@ set_os_specific_compiler_settings() else # Linux STDLIB="stdc++" fi + + if [[ ($OS == Darwin) && ($CC == clang*) ]]; then + CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" + CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" + fi } link_to_standard_library() diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index 3c14f53..29d51cd 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -340,6 +340,11 @@ set_os_specific_compiler_settings() else # Linux STDLIB="stdc++" fi + + if [[ ($OS == Darwin) && ($CC == clang*) ]]; then + CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" + CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" + fi } link_to_standard_library() diff --git a/install.sh b/install.sh index 11cea3a..734ee70 100755 --- a/install.sh +++ b/install.sh @@ -327,6 +327,11 @@ set_os_specific_compiler_settings() else # Linux STDLIB="stdc++" fi + + if [[ ($OS == Darwin) && ($CC == clang*) ]]; then + CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" + CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE" + fi } link_to_standard_library()