Correct post-build filtering options

Author: theotherjimmy

tools/targets/__init__.py

@@ -356,7 +356,7 @@ def is_PSA_secure_target(self):
     def is_PSA_non_secure_target(self):
         return 'NSPE_Target' in self.labels
 
-    def get_post_build_hook(self, toolchain):
+    def get_post_build_hook(self, toolchain_labels):
         """Initialize the post-build hooks for a toolchain. For now, this
         function only allows "post binary" hooks (hooks that are executed
         after the binary image is extracted from the executable file)
@@ -401,9 +401,8 @@ def get_post_build_hook(self, toolchain):
                 ("not found in class '%s'" %  class_name))
         # Check if the hook specification also has toolchain restrictions
         toolchain_restrictions = set(hook_data.get("toolchains", []))
-        toolchain_labels = set(c.__name__ for c in getmro(toolchain.__class__))
         if toolchain_restrictions and \
-           not toolchain_labels.intersection(toolchain_restrictions):
+           not set(toolchain_labels).intersection(toolchain_restrictions):
             return
         return getattr(cls, function_name)
 

tools/toolchains/mbed_toolchain.py

@@ -136,8 +136,6 @@ def __init__(self, target, notify=None, macros=None, build_profile=None,
         self.target = target
         self.name = self.__class__.__name__
 
-        # compile/assemble/link/binary hooks
-        self._post_build_hook = target.get_post_build_hook(self.name)
 
         # Toolchain flags
         self.flags = deepcopy(build_profile or self.profile_template)
@@ -754,9 +752,13 @@ def link_program(self, r, tmp_path, name):
         else:
             updatable = None
 
-        if self._post_build_hook:
+        # compile/assemble/link/binary hooks
+        post_build_hook = self.target.get_post_build_hook(
+            self._get_toolchain_labels()
+        )
+        if post_build_hook:
             self.progress("post-build", name)
-            self._post_build_hook(self, r, elf, full_path)
+            post_build_hook(self, r, elf, full_path)
         # Initialize memap and process map file. This doesn't generate output.
         self.mem_stats(mapfile)