Merge pull request #79871 from bruvzg/mingw_prefix_fix

[Windows] Try using objcopy and strip with prefix and without prefix.

1 files changed, 13 insertions, 3 deletions

diff --git a/platform/windows/platform_windows_builders.py b/platform/windows/platform_windows_builders.py
index b522a75a9c..51652fa814 100644
--- a/platform/windows/platform_windows_builders.py
+++ b/platform/windows/platform_windows_builders.py
@@ -5,14 +5,24 @@ All such functions are invoked in a subprocess on Windows to prevent build flaki
 """
 import os
 from detect import get_mingw_bin_prefix
+from detect import try_cmd
 from platform_methods import subprocess_main
 
 
 def make_debug_mingw(target, source, env):
     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 try_cmd("objcopy --version", env["mingw_prefix"], env["arch"]):
+        os.system(mingw_bin_prefix + "objcopy --only-keep-debug {0} {0}.debugsymbols".format(target[0]))
+    else:
+        os.system("objcopy --only-keep-debug {0} {0}.debugsymbols".format(target[0]))
+    if try_cmd("strip --version", env["mingw_prefix"], env["arch"]):
+        os.system(mingw_bin_prefix + "strip --strip-debug --strip-unneeded {0}".format(target[0]))
+    else:
+        os.system("strip --strip-debug --strip-unneeded {0}".format(target[0]))
+    if try_cmd("objcopy --version", env["mingw_prefix"], env["arch"]):
+        os.system(mingw_bin_prefix + "objcopy --add-gnu-debuglink={0}.debugsymbols {0}".format(target[0]))
+    else:
+        os.system("objcopy --add-gnu-debuglink={0}.debugsymbols {0}".format(target[0]))
 
 
 if __name__ == "__main__":