From 1dea24ce9ae6079ee1fa5cbc2ca8b8176b162568 Mon Sep 17 00:00:00 2001
From: Anton Maklakov <anton@espressif.com>
Date: Thu, 7 Jun 2018 14:01:41 +0800
Subject: Use the platform headers in the pass-2 and canadian gcc stages


diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index a6bf1ac..c95c5b9 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -350,12 +350,11 @@ do_gcc_core_backend() {
             ;;
     esac
 
-    # This is only needed when building libstdc++ in a canadian environment with
-    # this function being used for final step (i.e., when building for bare metal).
-    if [ "${build_step}" = "gcc_build" ]; then
-        CT_DoLog DEBUG "Copying headers to install area of core C compiler"
-        CT_DoExecLog ALL cp -a "${CT_HEADERS_DIR}" "${prefix}/${CT_TARGET}/include"
-    fi
+    case "${build_step}" in
+        core2|gcc_build)
+            CT_DoLog DEBUG "Copying headers to install area of core C compiler"
+            CT_DoExecLog ALL cp -a "${CT_HEADERS_DIR}" "${prefix}/${CT_TARGET}/include"
+    esac
 
     for tmp in ARCH ABI CPU TUNE FPU FLOAT ENDIAN; do
         eval tmp="\${CT_ARCH_WITH_${tmp}}"
-- 
cgit v0.10.2-6-g49f6