Skip to content

Commit 393cd0e

Browse files
authored
Merge pull request #741 from pmienk/master
Regenerate artifacts.
2 parents 2e984ee + 9c67881 commit 393cd0e

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
llvm: "llvm@16"
9898
secp256k1: "--build-secp256k1"
9999
cc: "clang"
100-
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
100+
flags: "-Os -fPIE"
101101
options: "--enable-isystem"
102102
packager: "brew"
103103
packages: "llvm@16 icu4c"
@@ -114,7 +114,7 @@ jobs:
114114
llvm: "llvm@16"
115115
secp256k1: "--build-secp256k1"
116116
cc: "clang"
117-
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
117+
flags: "-Os -fvisibility=hidden -fPIE"
118118
options: "--enable-isystem"
119119
packager: "brew"
120120
packages: "llvm@16 icu4c"
@@ -368,7 +368,7 @@ jobs:
368368
llvm: "llvm@16"
369369
secp256k1: "--build-secp256k1"
370370
cc: "clang"
371-
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
371+
flags: "-Os -fPIE"
372372
options: ""
373373
packager: "brew"
374374
packages: "llvm@16 icu4c"
@@ -385,7 +385,7 @@ jobs:
385385
llvm: "llvm@16"
386386
secp256k1: "--build-secp256k1"
387387
cc: "clang"
388-
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
388+
flags: "-Os -fvisibility=hidden -fPIE"
389389
options: ""
390390
packager: "brew"
391391
packages: "llvm@16 icu4c"

install-cmake.sh

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

331336
link_to_standard_library()

install-cmakepresets.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,11 @@ set_os_specific_compiler_settings()
334334
else # Linux
335335
STDLIB="stdc++"
336336
fi
337+
338+
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
339+
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
340+
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
341+
fi
337342
}
338343

339344
link_to_standard_library()

install.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,11 @@ set_os_specific_compiler_settings()
321321
else # Linux
322322
STDLIB="stdc++"
323323
fi
324+
325+
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
326+
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
327+
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
328+
fi
324329
}
325330

326331
link_to_standard_library()

0 commit comments

Comments
 (0)