Skip to content

Commit 9e1306f

Browse files
committed
Merge #29195: build: Fix -Xclang -internal-isystem option
d742be3 ci: Switch native macOS CI job to Xcode 15.0 (Hennadii Stepanov) 8decc5c build: Fix `-Xclang -internal-isystem` option (Hennadii Stepanov) Pull request description: This PR: - addresses #29165 (comment) - fixes #29174 ACKs for top commit: fanquake: ACK d742be3. The same as what was done in #27328. Tree-SHA512: 4788a0511e9fac638edab8e4f7ec62c5e08aeb07e518ab62fd53074ab3dd4eca1f62dc17c2af2b535bad12e77a7437e5c1c714cd03ce711e5d5e5c87d4620358
2 parents f921d94 + d742be3 commit 9e1306f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ jobs:
8989
uses: actions/checkout@v4
9090

9191
- name: Clang version
92-
run: clang --version
92+
run: |
93+
sudo xcode-select --switch /Applications/Xcode_15.0.app
94+
clang --version
9395
9496
- name: Install Homebrew packages
9597
env:

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ case $host in
740740
dnl option to system-ify all /usr/local/include paths without adding it to the list
741741
dnl of search paths in case it's not already there.
742742
if test "$suppress_external_warnings" != "no"; then
743-
AX_CHECK_PREPROC_FLAG([-Xclang -internal-isystem/usr/local/include], [CORE_CPPFLAGS="$CORE_CPPFLAGS -Xclang -internal-isystem/usr/local/include"], [], [$CXXFLAG_WERROR])
743+
AX_CHECK_PREPROC_FLAG([-Xclang -internal-isystem -Xclang /usr/local/include/], [CORE_CPPFLAGS="$CORE_CPPFLAGS -Xclang -internal-isystem -Xclang /usr/local/include/"], [], [$CXXFLAG_WERROR])
744744
fi
745745

746746
if test "$use_bdb" != "no" && $BREW list --versions berkeley-db@4 >/dev/null && test "$BDB_CFLAGS" = "" && test "$BDB_LIBS" = ""; then

0 commit comments

Comments
 (0)