Merge pull request #4749 from 0xc0170/fix_inc_paths

tools: fix toolchain extend inc paths
2017-07-13 16:35:24 +02:00 · 2017-07-13 16:35:24 +02:00 · 8148329fc8
parent aae62bd990 441fda979d
commit 8148329fc8
1 changed files with 4 additions and 1 deletions
--- a/tools/toolchains/init.py
+++ b/tools/toolchains/init.py
@ -863,7 +863,10 @@ class mbedToolchain:

        inc_paths = resources.inc_dirs
        if inc_dirs is not None:
-            inc_paths.extend(inc_dirs)
+            if isinstance(inc_dirs, list):
+                inc_paths.extend(inc_dirs)
+            else:
+                inc_paths.append(inc_dirs)
        # De-duplicate include paths
        inc_paths = set(inc_paths)
        # Sort include paths for consistency