Skip to content

build: fix mac CI ccache, only wrap darwin CC/CXX in env -u when include paths are set #7540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PastaPastaPasta merged 2 commits into from
Aug 4, 2026
+16 −6
Merged

build: fix mac CI ccache, only wrap darwin CC/CXX in env -u when include paths are set #7540

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
477e5a7
build: only wrap darwin CC/CXX in env -u when include paths are set
PastaPastaPasta Aug 4, 2026
1dc8e9b
build: keep TODO comment on darwin C_INCLUDE_PATH workaround
PastaPastaPasta Aug 4, 2026
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
21 changes: 15 additions & 6 deletions depends/hosts/darwin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,24 @@ darwin_STRIP=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-strip")
# in the SDK, where __has_feature(modules) is used to define USE_CLANG_TYPES,
# which is in turn used as an include guard.

# TODO: remove C_INCLUDE_PATH when it is indeed useless
# https://github.com/bitcoin/bitcoin/pull/30451 has been partiall reverted in #7184 and should be re-applied
darwin_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH $(clang_prog) --target=$(host) \
# C_INCLUDE_PATH/CPLUS_INCLUDE_PATH leak native-toolchain headers into the

@knst knst Aug 4, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep TODO; bitcoin#30451 has been done partially and this workaround should be removed when 30451 is fully backported.

# darwin cross-build and conflict with the SDK headers. Guix exports them
# (contrib/guix/libexec/build.sh), so strip them there with an `env -u`
# prefix. The prefix must not be emitted when the variables aren't set:
# ccache cannot parse a compiler command starting with `env` (it treats
# `env` as the compiler and the absolute clang path as a second source
# file), so an unconditional prefix silently disables ccache for every
# darwin compile. Unlike upstream (bitcoin#30451, which dropped the prefix
# entirely), our Guix environment still sets these variables.
ifneq ($(origin C_INCLUDE_PATH) $(origin CPLUS_INCLUDE_PATH),undefined undefined)
darwin_env_unset=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH
Comment thread
PastaPastaPasta marked this conversation as resolved.
endif

darwin_CC=$(darwin_env_unset) $(clang_prog) --target=$(host) \
-isysroot$(OSX_SDK) -nostdlibinc \
-iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks

# TODO: remove C_INCLUDE_PATH when it is indeed useless
# https://github.com/bitcoin/bitcoin/pull/30451 has been partiall reverted in #7184 and should be re-applied
darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH $(clangxx_prog) --target=$(host) \
darwin_CXX=$(darwin_env_unset) $(clangxx_prog) --target=$(host) \
-isysroot$(OSX_SDK) -nostdlibinc \
-iwithsysroot/usr/include/c++/v1 \
-iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks
Expand Down
Loading