Skip to content

Commit e9809ed

Browse files
authored
Merge pull request libbitcoin#282 from pmienk/master
Regenerate artifacts.
2 parents 48c7975 + ad1dce2 commit e9809ed

File tree

5 files changed

+20
-6
lines changed

5 files changed

+20
-6
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
secp256k1: "--build-secp256k1"
103103
zmq: "--build-zmq"
104104
cc: "clang"
105-
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
105+
flags: "-Os -fPIE"
106106
options: "--enable-isystem"
107107
packager: "brew"
108108
packages: "llvm@16 icu4c"
@@ -120,7 +120,7 @@ jobs:
120120
secp256k1: "--build-secp256k1"
121121
zmq: "--build-zmq"
122122
cc: "clang"
123-
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
123+
flags: "-Os -fvisibility=hidden -fPIE"
124124
options: "--enable-isystem"
125125
packager: "brew"
126126
packages: "llvm@16 icu4c"
@@ -380,7 +380,7 @@ jobs:
380380
secp256k1: "--build-secp256k1"
381381
zmq: "--build-zmq"
382382
cc: "clang"
383-
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
383+
flags: "-Os -fPIE"
384384
options: ""
385385
packager: "brew"
386386
packages: "llvm@16 icu4c"
@@ -398,7 +398,7 @@ jobs:
398398
secp256k1: "--build-secp256k1"
399399
zmq: "--build-zmq"
400400
cc: "clang"
401-
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
401+
flags: "-Os -fvisibility=hidden -fPIE"
402402
options: ""
403403
packager: "brew"
404404
packages: "llvm@16 icu4c"

builds/msvc/vs2022/libbitcoin-system.import.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
<!-- WIN32_LEAN_AND_MEAN avoids inclusion of certain headers, winsock.h conflicts with boost and protocol use of winsock2.h. -->
5252
<PreprocessorDefinitions>WITH_ICU;WIN32_LEAN_AND_MEAN;NOMINMAX;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5353
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-system)' == 'static' Or '$(Linkage-libbitcoin-system)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
54-
</ClCompile>
55-
<ClCompile>
54+
<PreprocessorDefinitions Condition="$(Configuration.IndexOf('Debug')) != -1">_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5655
<!-- Enable use of CPU intrinsics. -->
5756
<PreprocessorDefinitions Condition="'$(Option-avx512)' == 'true'">WITH_AVX512;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5857
<PreprocessorDefinitions Condition="'$(Option-avx2)' == 'true'">WITH_AVX2;%(PreprocessorDefinitions)</PreprocessorDefinitions>

install-cmake.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,11 @@ set_os_specific_compiler_settings()
332332
else # Linux
333333
STDLIB="stdc++"
334334
fi
335+
336+
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
337+
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
338+
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
339+
fi
335340
}
336341

337342
link_to_standard_library()

install-cmakepresets.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,11 @@ set_os_specific_compiler_settings()
340340
else # Linux
341341
STDLIB="stdc++"
342342
fi
343+
344+
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
345+
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
346+
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
347+
fi
343348
}
344349

345350
link_to_standard_library()

install.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,11 @@ set_os_specific_compiler_settings()
327327
else # Linux
328328
STDLIB="stdc++"
329329
fi
330+
331+
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
332+
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
333+
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
334+
fi
330335
}
331336

332337
link_to_standard_library()

0 commit comments

Comments
 (0)