[oe-commits] [openembedded-core] 03/04: Revert "gcc-cross.inc: Prevent native sysroot from leaking into configargs.h"

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit b0cd78e273248cbcf3e64fba53df24f7f4b37e5c
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Nov 28 14:36:22 2019 +0000

    Revert "gcc-cross.inc: Prevent native sysroot from leaking into configargs.h"
    
    This reverts commit ad7a7fcdb997c0978c428833f8748cf61c351bc7.
---
 meta/recipes-devtools/gcc/gcc-cross.inc   | 7 -------
 meta/recipes-devtools/gcc/gcc-runtime.inc | 4 ++++
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 06ba3cc..8855bb1 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -61,13 +61,6 @@ do_compile () {
 	export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
 	export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
 
-	# 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 at g' ${B}/gcc/configargs.h
-	sed -i 's@${STAGING_DIR_HOST}@/host at g' ${B}/gcc/configargs.h
-
 	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)
 	# now generate script to drive testing
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index d3f8ae8..437a9df 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -302,6 +302,10 @@ do_check() {
 
     # HACK: this works around the configure setting CXX with -nostd* args
     sed -i 's/-nostdinc++ -nostdlib++//g' $(find ${B} -name testsuite_flags | head -1)
+    # HACK: this works around the de-stashing changes to configargs.h, as well as recipe-sysroot changing the content
+    sed -i '/static const char configuration_arguments/d' ${B}/gcc/configargs.h
+    ${CC} -v 2>&1 | grep "^Configured with:" | \
+        sed 's/Configured with: \(.*\)/static const char configuration_arguments[] = "\1";/g' >> ${B}/gcc/configargs.h
 
     if [ "${TOOLCHAIN_TEST_TARGET}" = "user" ]; then
         # qemu user has issues allocating large amounts of memory

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.