summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-12-21 18:38:35 +0100
committerRémi Verschelde <rverschelde@gmail.com>2022-12-21 18:38:35 +0100
commitc3c001ab4bc6b1997f4dc9debf64d0915dc9740b (patch)
tree465ad4456828e59a7968d1c830c2eb15423c8367 /platform
parent27b637ce383ef7ef89d5052098e4d31aef1ff5a3 (diff)
parent865c637279ca8491b725d3a290a199239f18110f (diff)
Merge pull request #70399 from akien-mga/windows-mingw-fix-separate-debugsyms
SCons: Fix `separate_debug_symbols` option for Windows/MinGW
Diffstat (limited to 'platform')
-rw-r--r--platform/windows/platform_windows_builders.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/platform/windows/platform_windows_builders.py b/platform/windows/platform_windows_builders.py
index 33ca2e8ffa..b522a75a9c 100644
--- a/platform/windows/platform_windows_builders.py
+++ b/platform/windows/platform_windows_builders.py
@@ -4,18 +4,15 @@ All such functions are invoked in a subprocess on Windows to prevent build flaki
"""
import os
+from detect import get_mingw_bin_prefix
from platform_methods import subprocess_main
def make_debug_mingw(target, source, env):
- mingw_prefix = ""
- if env["arch"] == "x86_32":
- mingw_prefix = env["mingw_prefix_32"]
- else:
- mingw_prefix = env["mingw_prefix_64"]
- os.system(mingw_prefix + "objcopy --only-keep-debug {0} {0}.debugsymbols".format(target[0]))
- os.system(mingw_prefix + "strip --strip-debug --strip-unneeded {0}".format(target[0]))
- os.system(mingw_prefix + "objcopy --add-gnu-debuglink={0}.debugsymbols {0}".format(target[0]))
+ mingw_bin_prefix = get_mingw_bin_prefix(env["mingw_prefix"], env["arch"])
+ os.system(mingw_bin_prefix + "objcopy --only-keep-debug {0} {0}.debugsymbols".format(target[0]))
+ os.system(mingw_bin_prefix + "strip --strip-debug --strip-unneeded {0}".format(target[0]))
+ os.system(mingw_bin_prefix + "objcopy --add-gnu-debuglink={0}.debugsymbols {0}".format(target[0]))
if __name__ == "__main__":