From 723ca994e7ae6b530b695fd7f05cfd0e2ac2cc50 Mon Sep 17 00:00:00 2001
From: hollylee <925338+hollylee@users.noreply.github.com>
Date: Wed, 11 Sep 2019 09:03:59 +0800
Subject: [PATCH] GetGCCRoot() for usual toolchain dir structures

So don't depend on any special assumptions. See comments in the codes.
---
 tools/gcc.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tools/gcc.py b/tools/gcc.py
index 525e11c44b..e45c07a57e 100644
--- a/tools/gcc.py
+++ b/tools/gcc.py
@@ -37,6 +37,24 @@ def GetGCCRoot(rtconfig):
     else:
         root_path = os.path.join(exec_path, '..', prefix)
 
+    # Usually the cross compiling gcc toolchain has directory as:
+    #
+    # bin
+    # lib
+    # share
+    # arm-none-eabi
+    #    bin
+    #    include
+    #    lib
+    #    share
+    prefix = rtconfig.PREFIX
+    if prefix.endswith('-'):
+        prefix = prefix[:-1]
+
+    fn = os.path.join(root, prefix, 'include', filename)
+    if os.path.isfile(fn):
+        return True
+    
     return root_path
 
 def CheckHeader(rtconfig, filename):