diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-26 23:09:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-26 23:09:01 +0200 |
| commit | 046c69b2a567ce84fa53959615eed40c380730b5 (patch) | |
| tree | 0058da4264c720730e84df368d092ab69cc1bd8d | |
| parent | bd219de7fe25da5a56a661332a0a59c287b94742 (diff) | |
| parent | fce3602a1e892cbc35fb3aa409bdae835a37be4f (diff) | |
Merge pull request #64923 from akien-mga/scons-linux-gnu-ld-detection
Linux: Fix GNU ld detection for `pck_embed` linker script
| -rw-r--r-- | platform/linuxbsd/detect.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index 8563cc3cb2..dd829bdb9b 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -387,7 +387,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( |