From 513a6b6206508e8484e99bcff65ced77aaced899 Mon Sep 17 00:00:00 2001
From: Rhys Mainwaring <rhys.mainwaring@me.com>
Date: Fri, 5 Apr 2024 17:53:32 +0100
Subject: [PATCH] Tools: ardupilotwaf: use classic clang linker when compiling
 on macOS

- Fix issue where linker fails with Xcode 15.3.
- Add check for CC_VERSION.

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
---
 Tools/ardupilotwaf/boards.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index ed4b653a490..cdfdc0c90af 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -433,9 +433,14 @@ class Board:
             ]
 
         if cfg.env.DEST_OS == 'darwin':
-            env.LINKFLAGS += [
-                '-Wl,-dead_strip',
-            ]
+            if self.cc_version_gte(cfg, 15, 0):
+                env.LINKFLAGS += [
+                    '-Wl,-dead_strip,-ld_classic',
+                ]
+            else:
+                env.LINKFLAGS += [
+                    '-Wl,-dead_strip',
+                ]
         else:
             env.LINKFLAGS += [
                 '-fno-exceptions',