From f8ca5c31946e11dd298ccb9da1fa76fda9c2066e Mon Sep 17 00:00:00 2001 From: Jonathan Schwender <55576758+jschwe@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:42:03 +0200 Subject: [PATCH] Fix packaging when cross compiling (#33454) We need to check the compilation target, not the host platform. Signed-off-by: Jonathan Schwender --- python/servo/package_commands.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 90cba92cfa1..2f43332539b 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -36,7 +36,6 @@ from servo.command_base import ( BuildNotFound, cd, CommandBase, - is_macosx, is_windows, ) from servo.util import delete, get_target_dir @@ -179,7 +178,7 @@ class PackageCommands(CommandBase): except subprocess.CalledProcessError as e: print("Packaging Android exited with return value %d" % e.returncode) return e.returncode - elif is_macosx(): + elif 'darwin' in self.target.triple(): print("Creating Servo.app") dir_to_dmg = path.join(target_dir, 'dmg') dir_to_app = path.join(dir_to_dmg, 'Servo.app') @@ -248,7 +247,7 @@ class PackageCommands(CommandBase): delete(dir_to_dmg) print("Packaged Servo into " + dmg_path) - elif is_windows(): + elif 'windows' in self.target.triple(): dir_to_msi = path.join(target_dir, 'msi') if path.exists(dir_to_msi): print("Cleaning up from previous packaging")