Fix issue with libmalloc variation string order: would build 'libemmalloc-ww-debug-noerrno' but try to use 'libemmalloc-debug-ww-noerrno'

Author: juj

tools/system_libs.py

@@ -1302,9 +1302,14 @@ def get_base_name_prefix(self):
     return 'lib%s' % self.malloc
 
   def get_base_name(self):
-    name = super().get_base_name()
+    name = self.get_base_name_prefix()
     if self.is_debug and not self.memvalidate and not self.verbose:
       name += '-debug'
+
+    # Add the prefixes for malloc ('-mt' / '-ww') after the '-debug' part, since the -debug string
+    # is part of the user-submitted -sMALLOC prefix (e.g. -sMALLOC=dlmalloc-debug)
+    name += super().get_base_name().replace(self.get_base_name_prefix(), '')
+
     if not self.use_errno:
       # emmalloc doesn't actually use errno, but it's easier to build it again
       name += '-noerrno'
@@ -1339,11 +1344,11 @@ def get_default_variation(cls, **kwargs):
   @classmethod
   def variations(cls):
     combos = super().variations()
-    return ([dict(malloc='dlmalloc', **combo) for combo in combos if not combo['memvalidate'] and not combo['verbose']] +
-            [dict(malloc='emmalloc', **combo) for combo in combos if not combo['memvalidate'] and not combo['verbose']] +
-            [dict(malloc='emmalloc-memvalidate-verbose', **combo) for combo in combos if combo['memvalidate'] and combo['verbose']] +
-            [dict(malloc='emmalloc-memvalidate', **combo) for combo in combos if combo['memvalidate'] and not combo['verbose']] +
-            [dict(malloc='emmalloc-verbose', **combo) for combo in combos if combo['verbose'] and not combo['memvalidate']])
+    return ([dict(malloc='dlmalloc',                     **combo) for combo in combos if not combo['memvalidate'] and not combo['verbose']] +
+            [dict(malloc='emmalloc',                     **combo) for combo in combos if not combo['memvalidate'] and not combo['verbose']] +
+            [dict(malloc='emmalloc-memvalidate-verbose', **combo) for combo in combos if     combo['memvalidate'] and     combo['verbose']] +
+            [dict(malloc='emmalloc-memvalidate',         **combo) for combo in combos if     combo['memvalidate'] and not combo['verbose']] +
+            [dict(malloc='emmalloc-verbose',             **combo) for combo in combos if not combo['memvalidate'] and     combo['verbose']])
 
 
 class libal(Library):