Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions builds/msvc/vs2022/libbitcoin-system.import.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 5 additions & 0 deletions install-cmakepresets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 5 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading