highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-27 09:21:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#29195: build: Fix -Xclang -internal-isystem option

Browse Source 
d742be3d3f5d5063d7160f72422bce2fec953f38 ci: Switch native macOS CI job to Xcode 15.0 (Hennadii Stepanov)
8decc5c726caca2381cffbd1b3585862421f5b8e build: Fix `-Xclang -internal-isystem` option (Hennadii Stepanov)

Pull request description:

  This PR:
  - addresses https://github.com/bitcoin/bitcoin/pull/29165#discussion_r1439433156
  - fixes https://github.com/bitcoin/bitcoin/issues/29174

ACKs for top commit:
  fanquake:
    ACK d742be3d3f5d5063d7160f72422bce2fec953f38. The same as what was done in #27328.

Tree-SHA512: 4788a0511e9fac638edab8e4f7ec62c5e08aeb07e518ab62fd53074ab3dd4eca1f62dc17c2af2b535bad12e77a7437e5c1c714cd03ce711e5d5e5c87d4620358
This commit is contained in:
fanquake 2024-01-09 10:34:02 +00:00
commit 9e1306fc88
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -89,7 +89,9 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Clang version - name: Clang version
run: clang --version run: |
sudo xcode-select --switch /Applications/Xcode_15.0.app
clang --version
- name: Install Homebrew packages - name: Install Homebrew packages
env: env:

2
configure.ac
View File

@ -740,7 +740,7 @@ case $host in
dnl option to system-ify all /usr/local/include paths without adding it to the list dnl option to system-ify all /usr/local/include paths without adding it to the list
dnl of search paths in case it's not already there. dnl of search paths in case it's not already there.
if test "$suppress_external_warnings" != "no"; then if test "$suppress_external_warnings" != "no"; then
AX_CHECK_PREPROC_FLAG([-Xclang -internal-isystem/usr/local/include], [CORE_CPPFLAGS="$CORE_CPPFLAGS -Xclang -internal-isystem/usr/local/include"], [], [$CXXFLAG_WERROR]) AX_CHECK_PREPROC_FLAG([-Xclang -internal-isystem -Xclang /usr/local/include/], [CORE_CPPFLAGS="$CORE_CPPFLAGS -Xclang -internal-isystem -Xclang /usr/local/include/"], [], [$CXXFLAG_WERROR])
fi fi
if test "$use_bdb" != "no" && $BREW list --versions berkeley-db@4 >/dev/null && test "$BDB_CFLAGS" = "" && test "$BDB_LIBS" = ""; then if test "$use_bdb" != "no" && $BREW list --versions berkeley-db@4 >/dev/null && test "$BDB_CFLAGS" = "" && test "$BDB_LIBS" = ""; then