Tools: wrap _malloc_r on cygwin

fixes dual allocation heap bug See https://cygwin.com/pipermail/cygwin/2000-July/038916.html
ArduPilot · Jul 6, 2024 · 4d942f4 · 4d942f4
1 parent 2f9f58d
commit 4d942f4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
@@ -753,8 +753,10 @@ def configure_env(self, cfg, env):
         ]
 
         # wrap malloc to ensure memory is zeroed
-        # don't do this on MacOS as ld doesn't support --wrap
-        if platform.system() != 'Darwin':
+        if cfg.env.DEST_OS == 'cygwin':
+            # on cygwin we need to wrap _malloc_r instead
+            env.LINKFLAGS += ['-Wl,--wrap,_malloc_r']
+        elif platform.system() != 'Darwin':
             env.LINKFLAGS += ['-Wl,--wrap,malloc']
 
         if cfg.options.enable_sfml: