Review comments changes

Author: hugueskamba

tools/build_api.py

@@ -253,7 +253,7 @@ def find_valid_toolchain(target, toolchain):
             ):
                 end_warnings.append(UARM_TOOLCHAIN_WARNING)
 
-            if replace_small_c_lib(target, toolchain, True):
+            if replace_small_c_lib(target, toolchain):
                 warning = (
                     "Warning: We noticed that target.c_lib is set to small.\n"
                     "As the {} target does not support a small C library for the {} toolchain,\n"

tools/toolchains/arm.py

@@ -74,7 +74,8 @@ def __init__(self, target, notify=None, macros=None,
 
         toolchain = "arm"
 
-        replace_small_c_lib(target, toolchain)
+        if replace_small_c_lib(target, toolchain):
+            target.c_lib = "std"
 
         self.check_c_lib_supported(target, toolchain)
 
@@ -570,7 +571,8 @@ def __init__(self, target, *args, **kwargs):
 
         toolchain = "arm"
 
-        replace_small_c_lib(target, toolchain)
+        if replace_small_c_lib(target, toolchain):
+            target.c_lib = "std"
 
         self.check_c_lib_supported(target, toolchain)
 

tools/toolchains/gcc.py

@@ -58,7 +58,8 @@ def __init__(self, target,  notify=None, macros=None, build_profile=None,
         if hasattr(target, "c_lib"):
             toolchain = "gcc_arm"
 
-            replace_small_c_lib(target, toolchain)
+            if replace_small_c_lib(target, toolchain):
+                target.c_lib = "std"
 
             self.check_c_lib_supported(target, toolchain)
             c_lib = target.c_lib

tools/toolchains/iar.py

@@ -58,7 +58,8 @@ def __init__(self, target, notify=None, macros=None, build_profile=None,
 
         toolchain = "iar"
 
-        replace_small_c_lib(target, toolchain)
+        if replace_small_c_lib(target, toolchain):
+            target.c_lib = "std"
 
         self.check_c_lib_supported(target, "iar")
 

tools/toolchains/mbed_toolchain.py

@@ -1394,21 +1394,16 @@ def report(self):
         to_ret.update(self.config.report)
         return to_ret
 
-def replace_small_c_lib(target, toolchain, check_only=False):
+def replace_small_c_lib(target, toolchain):
     """
-    Replace the small C lib for the standard C lib.
-
-    The replacement occurs only if the small C lib is not supported but the
-    standard C lib is.
+    Check if the small C lib should be replaced with the standard C lib.
     Return True if the replacement occurs otherwise return None.
     """
     if (
         not is_library_supported("small", target, toolchain)
         and is_library_supported("std", target, toolchain)
         and target.c_lib == "small"
     ):
-        if not check_only:
-            target.c_lib = "std"
         return True