Set windows subsystem on MSVC builds with editbin

1 files changed, 33 insertions, 24 deletions

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 275b2309f2e..9771a7c9b8a 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -23,7 +23,7 @@ from mach.decorators import (
     Command,
 )
 
-from servo.command_base import CommandBase, cd, call, BIN_SUFFIX
+from servo.command_base import CommandBase, cd, call, BIN_SUFFIX, host_triple
 
 
 def format_duration(seconds):
@@ -86,11 +86,11 @@ def notify_darwin(title, text):
         raise Exception("Optional Python module 'pyobjc' is not installed.")
 
 
-def notify_build_done(elapsed):
+def notify_build_done(elapsed, success=True):
     """Generate desktop notification when build is complete and the
     elapsed build time was longer than 30 seconds."""
     if elapsed > 30:
-        notify("Servo build", "Completed in %s" % format_duration(elapsed))
+        notify("Servo build", "%s in %s" % ("Completed" if success else "FAILED", format_duration(elapsed)))
 
 
 def notify(title, text):
@@ -236,36 +236,45 @@ class MachCommands(CommandBase):
 
         cargo_binary = "cargo" + BIN_SUFFIX
 
-        if sys.platform == "win32" or sys.platform == "msys":
-            env["RUSTFLAGS"] = "-C link-args=-Wl,--subsystem,windows"
+        if sys.platform in ("win32", "msys"):
+            if "msvc" not in host_triple():
+                env[b'RUSTFLAGS'] = b'-C link-args=-Wl,--subsystem,windows'
 
         status = call(
             [cargo_binary, "build"] + opts,
             env=env, cwd=self.servo_crate(), verbose=verbose)
         elapsed = time() - build_start
 
-        if sys.platform == "win32" or sys.platform == "msys":
-            shutil.copy(path.join(self.get_top_dir(), "components", "servo", "servo.exe.manifest"),
-                        path.join(base_path, "debug" if dev else "release"))
-
-        # On the Mac, set a lovely icon. This makes it easier to pick out the Servo binary in tools
-        # like Instruments.app.
-        if sys.platform == "darwin":
-            try:
-                import Cocoa
-                icon_path = path.join(self.get_top_dir(), "resources", "servo.png")
-                icon = Cocoa.NSImage.alloc().initWithContentsOfFile_(icon_path)
-                if icon is not None:
-                    Cocoa.NSWorkspace.sharedWorkspace().setIcon_forFile_options_(icon,
-                                                                                 servo_path,
-                                                                                 0)
-            except ImportError:
-                pass
+        # Do some additional things if the build succeeded
+        if status == 0:
+            if sys.platform in ("win32", "msys"):
+                servo_exe_dir = path.join(base_path, "debug" if dev else "release")
+                # On windows, copy in our manifest
+                shutil.copy(path.join(self.get_top_dir(), "components", "servo", "servo.exe.manifest"),
+                            servo_exe_dir)
+                # And on msvc builds, use editbin to change the subsystem to windows
+                if "msvc" in host_triple():
+                    call(["editbin", "/nologo", "/subsystem:windows", path.join(servo_exe_dir, "servo.exe")],
+                         verbose=verbose)
+    
+                elif sys.platform == "darwin":
+                    # On the Mac, set a lovely icon. This makes it easier to pick out the Servo binary in tools
+                    # like Instruments.app.
+                    try:
+                        import Cocoa
+                        icon_path = path.join(self.get_top_dir(), "resources", "servo.png")
+                        icon = Cocoa.NSImage.alloc().initWithContentsOfFile_(icon_path)
+                        if icon is not None:
+                            Cocoa.NSWorkspace.sharedWorkspace().setIcon_forFile_options_(icon,
+                                                                                         servo_path,
+                                                                                         0)
+                    except ImportError:
+                        pass
 
         # Generate Desktop Notification if elapsed-time > some threshold value
-        notify_build_done(elapsed)
+        notify_build_done(elapsed, status == 0)
 
-        print("Build completed in %s" % format_duration(elapsed))
+        print("Build %s in %s" % ("Completed" if status == 0 else "FAILED", format_duration(elapsed)))
         return status
 
     @Command('build-cef',