1 files changed, 7 insertions, 3 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 869d1b6d60..2ddc3d7c9f 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -61,9 +61,9 @@ SYSTEMHEADERS = "${target_includedir}"
 SYSTEMLIBS = "${target_base_libdir}/"
 SYSTEMLIBS1 = "${target_libdir}/"
 
-do_configure_prepend () {
-        # Change the default dynamic linker path, only useful for SDK, other's value
-        # are not changed according to the SYSTEMLIBS_DIR
+do_headerfix () {
+        # Change the default dynamic linker path, in case $base_liddir is non-standard
+        # (e.g. in multilib or sdk cases)
         #
         # We want something like the following:
         #       #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
@@ -72,7 +72,11 @@ do_configure_prepend () {
         #
         sed -i ${S}/gcc/config/*/linux*.h -e \
                 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\) \( *"/lib.*\)/\(.*\)#\1 SYSTEMLIBS_DIR "\3#'
+}
 
+addtask headerfix after do_unpack before do_patch
+
+do_configure_prepend () {
         # teach gcc to find correct target includedir when checking libc ssp support
         mkdir -p ${B}/gcc
         echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe