From 570841d267fd1d8d534e990ad2a5b90961ba359b Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sun, 20 Dec 2020 12:26:33 +0000 Subject: [PATCH] MASTER: Really fix Strip step --- master/builds.py | 6 ++++-- master/platforms.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/master/builds.py b/master/builds.py index 87c400d..2bf42b8 100644 --- a/master/builds.py +++ b/master/builds.py @@ -287,7 +287,8 @@ class ScummVMBuild(StandardBuild): packaging_cmd = platform.getPackagingCmd(self) else: if platform.getStripCmd(self) is not None: - f.addStep(scummsteps.Strip(command = platform.getStripCmd(self))) + f.addStep(scummsteps.Strip(command = platform.getStripCmd(self), + env = env)) if platform.canPackage(self): f.addStep(scummsteps.Package(disttarget = packaging_cmd, @@ -429,7 +430,8 @@ class ScummVMToolsBuild(StandardBuild): packaging_cmd = platform.getPackagingCmd(self) else: if platform.getStripCmd(self) is not None: - f.addStep(scummsteps.Strip(command = platform.getStripCmd(self))) + f.addStep(scummsteps.Strip(command = platform.getStripCmd(self), + env = env)) if platform.canPackage(self): f.addStep(scummsteps.Package(disttarget = packaging_cmd, diff --git a/master/platforms.py b/master/platforms.py index f79145c..07ac4c1 100644 --- a/master/platforms.py +++ b/master/platforms.py @@ -616,7 +616,8 @@ def windows_mxe(suffix, target): builds.ScummVMBuild: [ "--enable-updates"], } platform.strip_cmd = { - builds.ScummVMBuild: ['${STRIP}', 'scummvm.exe'], + # As we use an environment variable, we need to use string to spawn a shell + builds.ScummVMBuild: '"${STRIP}" scummvm.exe', } platform.built_files = { builds.ScummVMBuild: [ "scummvm.exe" ],