mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
cmake: Fix sporadic issues when determining compiler internals
When `-pipe` is enabled, GCC passes data between its different
executables using pipes instead of temporary files. This leads to issues
when cmake attempts to infer compiler internals via the `-v` parameter
as each executable will print to `stderr` in parallel.
In turn this may lead to compilation issues down the line as for example
the system include directories could not be determined properly which
may then propagate to issues such as:
recipe-sysroot/usr/include/c++/11.3.0/cstdlib:75:15: fatal error:
stdlib.h: No such file or directory
| 75 | #include_next <stdlib.h>
| | ^~~~~~~~~~
| compilation terminated.
| ninja: build stopped: subcommand failed.
| WARNING: exit code 1 from a shell command.
Fix this stripping `-pipe` from the command line used to determine
compiler internals.
(From OE-Core rev: 8e2233fd0509b9f20c19d5006dd7ef0c2260bdba)
Signed-off-by: Philip Lorenz <philip.lorenz@bmw.de>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
b3366f02c2
commit
872786c742
@@ -17,6 +17,7 @@ LIC_FILES_CHKSUM = "file://Copyright.txt;md5=31023e1d3f51ca90a58f55bcee8e2339 \
|
||||
CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
|
||||
|
||||
SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
|
||||
file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \
|
||||
file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \
|
||||
file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
|
||||
"
|
||||
|
||||
+52
@@ -0,0 +1,52 @@
|
||||
From dab7ba34f87be0172f6586325656ee962de0029e Mon Sep 17 00:00:00 2001
|
||||
From: Philip Lorenz <philip.lorenz@bmw.de>
|
||||
Date: Mon, 3 Jun 2024 13:19:24 +0200
|
||||
Subject: [PATCH] CMakeDetermineCompilerABI: Strip -pipe from compile flags
|
||||
|
||||
When `-pipe` is enabled, GCC passes data between its different
|
||||
executables using pipes instead of temporary files. This leads to issues
|
||||
when cmake attempts to infer compiler internals via the `-v` parameter
|
||||
as each executable will print to `stderr` in parallel.
|
||||
|
||||
For example we have observed the following outputs in our builds which
|
||||
sporadically lead to build failures as system include directories were
|
||||
not detected reliably:
|
||||
|
||||
Parsed CXX implicit include dir info from above output: rv=done
|
||||
found start of include info
|
||||
found start of implicit include info
|
||||
add: [.../usr/bin/x86_64-poky-linux/../../lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.4.0/include]
|
||||
add: [.../usr/bin/x86_64-poky-linux/../../lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.4.0/include-fixed]
|
||||
add: [.../usr/include/c++/11.4.0]
|
||||
add: [.../usr/include/c++/11.4.0/x86_64-poky-linux]
|
||||
add: [.../usr/include/c++/11.4.0/backward]
|
||||
add: [.../usr/lib/x86_64-poky-linux/11.4.0/include]
|
||||
add: [...GNU assembler version 2.38 (x86_64-poky-linux) using BFD version (GNU Binutils) 2.38.20220708]
|
||||
add: [/usr/include]
|
||||
end of search list found
|
||||
|
||||
Fix this issue by stripping the `-pipe` parameter from the compilation
|
||||
flag when determining the toolchain configuration.
|
||||
|
||||
Upstream-Status: Backport [3.32.0, 71be059f3f32b6791427893a48ba4815a19e2e78]
|
||||
Signed-off-by: Philip Lorenz <philip.lorenz@bmw.de>
|
||||
---
|
||||
Modules/CMakeDetermineCompilerABI.cmake | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake
|
||||
index 8191d819bf..ae4c9ee44e 100644
|
||||
--- a/Modules/CMakeDetermineCompilerABI.cmake
|
||||
+++ b/Modules/CMakeDetermineCompilerABI.cmake
|
||||
@@ -35,6 +35,11 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
|
||||
|
||||
# Avoid failing ABI detection on warnings.
|
||||
string(REGEX REPLACE "(^| )-Werror([= ][^ ]*)?( |$)" " " CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}")
|
||||
+ # Avoid passing of "-pipe" when determining the compiler internals. With
|
||||
+ # "-pipe" GCC will use pipes to pass data between the involved
|
||||
+ # executables. This may lead to issues when their stderr output (which
|
||||
+ # contains the relevant compiler internals) becomes interweaved.
|
||||
+ string(REGEX REPLACE "(^| )-pipe( |$)" " " CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}")
|
||||
|
||||
# Save the current LC_ALL, LC_MESSAGES, and LANG environment variables
|
||||
# and set them to "C" that way GCC's "search starts here" text is in
|
||||
Reference in New Issue
Block a user