This is an automated email from the ASF dual-hosted git repository.
Gabriel39 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 89b9c7d6b0d [fix](build) Load float.h before macOS system headers
(#69136)
89b9c7d6b0d is described below
commit 89b9c7d6b0d6ce0a91c6796f0f3acdf3e44d6bb1
Author: zy-kkk <[email protected]>
AuthorDate: Fri Oct 16 15:27:48 2026 +0800
[fix](build) Load float.h before macOS system headers (#69136)
### What problem does this PR solve?
Issue Number: N/A
Related PR: N/A
Problem Summary: With the macOS 27 SDK, math.h requests only INFINITY
and NAN from float.h. The libc++ wrapper include guard then prevents
later includes from defining DBL_EPSILON and other floating-point
macros. This breaks S2 headers in BE unity builds and Boost headers on
branch-4.1. Force the full float.h header into macOS C++ compilations
before both source headers and the PCH, including builds with PCH
disabled.
### Release note
None
### Check List (For Author)
- Test: Manual compiler probes reproduce the missing macros with LLVM 20
and 22 on SDK 27 and restore them with early float.h; SDK 26.5 passes.
The original master unity TU reproduces all three DBL_EPSILON errors. BE
CMake configure/generate and build hygiene checks pass. The build entry
point subsequently stops at Maven repository permissions. Full BE build
and fixed master unity TU validation are pending.
- Behavior changed: Yes, macOS C++ compilations include float.h first.
- Does this need documentation: No.
### What problem does this PR solve?
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
be/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index 874426d1dc9..8a36b1f8ac0 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -500,6 +500,10 @@ add_definitions(-DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H)
# Mac specific definitions - needed for system headers and third-party libs
if (OS_MACOSX)
add_definitions(-D_DARWIN_C_SOURCE)
+ # macOS 27's math.h requests only INFINITY/NAN from float.h. libc++'s
+ # float.h include guard then hides the remaining macros on later includes
+ # (e.g. DBL_EPSILON in S2). Load the full header before any source or PCH.
+ add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include float.h>")
endif()
if (RECORD_COMPILER_SWITCHES)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
