diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49e22ad8..55ab38cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,7 +97,7 @@ jobs: llvm: "llvm@16" secp256k1: "--build-secp256k1" cc: "clang" - flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" + flags: "-Os -fPIE" options: "--enable-isystem" packager: "brew" packages: "llvm@16 icu4c" @@ -114,7 +114,7 @@ jobs: llvm: "llvm@16" secp256k1: "--build-secp256k1" 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" @@ -368,7 +368,7 @@ jobs: llvm: "llvm@16" secp256k1: "--build-secp256k1" cc: "clang" - flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" + flags: "-Os -fPIE" options: "" packager: "brew" packages: "llvm@16 icu4c" @@ -385,7 +385,7 @@ jobs: llvm: "llvm@16" secp256k1: "--build-secp256k1" 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/install-cmake.sh b/install-cmake.sh index 7019b268..bfa6f686 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -326,6 +326,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 3aee9647..11861df2 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -334,6 +334,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 158ab5d1..138ed0ca 100755 --- a/install.sh +++ b/install.sh @@ -321,6 +321,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()