Merge pull request #282 from pmienk/master

Regenerate artifacts.
libbitcoin · Feb 24, 2025 · e9809ed · e9809ed
2 parents 48c7975 + ad1dce2
commit e9809ed
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git 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
@@ -51,8 +51,7 @@
       <!-- WIN32_LEAN_AND_MEAN avoids inclusion of certain headers, winsock.h conflicts with boost and protocol use of winsock2.h. -->
       <PreprocessorDefinitions>WITH_ICU;WIN32_LEAN_AND_MEAN;NOMINMAX;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-system)' == 'static' Or '$(Linkage-libbitcoin-system)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile>
+      <PreprocessorDefinitions Condition="$(Configuration.IndexOf('Debug')) != -1">_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!-- Enable use of CPU intrinsics. -->
       <PreprocessorDefinitions Condition="'$(Option-avx512)' == 'true'">WITH_AVX512;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-avx2)'   == 'true'">WITH_AVX2;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git 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
@@ -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
@@ -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()