godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux: Fix GNU ld detection for pck_embed linker script

Browse Source 
(cherry picked from commit fce3602a1e)
This commit is contained in:
Rémi Verschelde 2022-08-26 14:06:56 +02:00
parent 5d30d77fd7
commit b5e368c92b
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/x11/detect.py
View File

@ -405,7 +405,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(