From 44af8794384e18b0c82e9e5170dda46588f32a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 26 Aug 2022 14:06:56 +0200 Subject: [PATCH] Linux: Fix GNU ld detection for pck_embed linker script (cherry picked from commit fce3602a1e892cbc35fb3aa409bdae835a37be4f) --- platform/x11/detect.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 27c1a8cd0b2..592c8bbb5f4 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -416,7 +416,9 @@ def configure(env): import subprocess import re - linker_version_str = subprocess.check_output([env.subst(env["LINK"]), "-Wl,--version"]).decode("utf-8") + linker_version_str = subprocess.check_output( + [env.subst(env["LINK"]), "-Wl,--version"] + env.subst(env["LINKFLAGS"]) + ).decode("utf-8") gnu_ld_version = re.search("^GNU ld [^$]*(\d+\.\d+)$", linker_version_str, re.MULTILINE) if not gnu_ld_version: print(