asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #64923 from akien-mga/scons-linux-gnu-ld-detection

Browse source 
Linux: Fix GNU ld detection for `pck_embed` linker script
This commit is contained in:
Rémi Verschelde 2022-08-26 23:09:01 +02:00 committed by GitHub
commit 046c69b2a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/linuxbsd/detect.py
View file

@ -387,7 +387,9 @@ def configure(env):
import subprocess import subprocess
import re 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) gnu_ld_version = re.search("^GNU ld [^$]*(\d+\.\d+)$", linker_version_str, re.MULTILINE)
if not gnu_ld_version: if not gnu_ld_version:
print( print(