File tree Expand file tree Collapse file tree 5 files changed +20
-6
lines changed Expand file tree Collapse file tree 5 files changed +20
-6
lines changed Original file line number Diff line number Diff 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"
Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff 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
337342link_to_standard_library ()
Original file line number Diff line number Diff 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
345350link_to_standard_library ()
Original file line number Diff line number Diff 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
332337link_to_standard_library ()
You can’t perform that action at this time.
0 commit comments