Be more picky about which extra artifacts are deleted

Author: alexcrichton

master/master.cfg

@@ -1179,13 +1179,15 @@ def distsnap_buildfactory(platform, channel_label):
 
     # All remaining steps happen on the buildmaster
 
-    # find <platform>/*.gz | grep -v unknown-linux-gnu | xargs rm
+    # If we're not packaging as well then this platform is just producing std or
+    # cross artifacts, so delete everything related to the host platform.
     if platform not in packaging_platforms:
-        # `find`, not `ls`, because we need the full path to what we'll remove
-        clean_cmd = "find " + local_dist_platform_dir + \
-                        "/*.gz | grep unknown-linux-gnu | xargs rm"
-        f.addStep(MasterShellCommand(name="remove linux artifacts",
-                                     command=["sh", "-c", clean_cmd]))
+        for host in all_platform_hosts(platform):
+            # `find`, not `ls`, because we need the full path to what we'll remove
+            clean_cmd = "find " + local_dist_platform_dir + \
+                            "/*.gz | grep " + host + " | xargs rm"
+            f.addStep(MasterShellCommand(name="remove " + host + " artifacts",
+                                         command=["sh", "-c", clean_cmd]))
 
     # Add the commit-id file to indicate which commit this is
     # for. This will be checked by the DistSync buildstep later to