Merge pull request #741 from pmienk/master

Regenerate artifacts.
libbitcoin · Feb 24, 2025 · 393cd0e · 393cd0e
2 parents 2e984ee + 9c67881
commit 393cd0e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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()