Copy fixes for gcc-cross (84a78f46d594 and 0ead8cbdfb96) to gcc-cross-canadian.
This will improve (but not fix) reproducibility of gcc-cross-canadian.

Signed-off-by: Oleksandr Hnatiuk <[email protected]>
---
 meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc 
b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 7c4233c21157..127f97473f91 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -64,6 +64,20 @@ do_configure () {
 }
 
 do_compile () {
+       # Prevent native/host sysroot path from being used in configargs.h 
header,
+       # as it will be rewritten when used by other sysroots preventing support
+       # for gcc plugins
+       oe_runmake configure-gcc
+       sed -i 's@${STAGING_DIR_TARGET}@/host@g' ${B}/gcc/configargs.h
+       sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/configargs.h
+
+       # Prevent sysroot/workdir paths from being used in checksum-options.
+       # checksum-options is used to generate a checksum which is embedded into
+       # the output binary.
+       oe_runmake TARGET-gcc=checksum-options all-gcc
+       sed -i 's@${DEBUG_PREFIX_MAP}@@g' ${B}/gcc/checksum-options
+       sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/checksum-options
+
        oe_runmake all-host configure-target-libgcc
        (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c 
unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
 }
-- 
2.35.6

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#201819): 
https://lists.openembedded.org/g/openembedded-core/message/201819
Mute This Topic: https://lists.openembedded.org/mt/107179901/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to