Merge pull request #898 from aozima/pulls

[BSP] Fix the align issue in __bss_start. 
[Tools] Auto-detect the parameter type in SrcRemove.

1 files changed, 5 insertions, 7 deletions

diff --git a/tools/building.py b/tools/building.py
index 204fd5037f..f5cbd31617 100644
--- a/tools/building.py
+++ b/tools/building.py
@@ -695,15 +695,13 @@ def SrcRemove(src, remove):
     if not src:
         return
 
-    if type(src[0]) == type('str'):
-        for item in src:
+    for item in src:
+        if type(item) == type('str'):
             if os.path.basename(item) in remove:
                 src.remove(item)
-        return
-
-    for item in src:
-        if os.path.basename(item.rstr()) in remove:
-            src.remove(item)
+        else:
+            if os.path.basename(item.rstr()) in remove:
+                src.remove(item)
 
 def GetVersion():
     import SCons.cpp