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

Merge pull request #35209 from RandomShaper/fix_pck_embed_linux 

Fix error exporting to X11 with embedded PCK
This commit is contained in:
Rémi Verschelde 2020-01-16 18:45:20 +01:00 committed by GitHub
parent f2aa99a8e2 4eeae59293
commit 6b64c60b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/x11/detect.py
View File

@ -331,7 +331,13 @@ def configure(env):
env.Append(LIBS=['execinfo'])
if not env['tools']:
env.Append(LINKFLAGS=['-T', 'platform/x11/pck_embed.ld'])
import subprocess
import re
binutils_version = re.search('\s(\d+\.\d+)', str(subprocess.check_output(['ld', '-v']))).group(1)
if float(binutils_version) >= 2.30:
env.Append(LINKFLAGS=['-T', 'platform/x11/pck_embed.ld'])
else:
env.Append(LINKFLAGS=['-T', 'platform/x11/pck_embed.legacy.ld'])
## Cross-compilation

4
platform/x11/pck_embed.ld
View File

@ -1,9 +1,9 @@
SECTIONS
{
/* Add a zero-sized section; the exporter will patch it to enclose the data appended to the executable (embedded PCK) */
pck 0 (NOLOAD) :
pck 0 (INFO) :
{
/* Just some content to avoid the linker discarding the section */
/* binutils >= 2.30 allow it being zero-sized, but needs something between the braces to keep the section */
. = ALIGN(8);
}
}

10
platform/x11/pck_embed.legacy.ld Normal file
View File

@ -0,0 +1,10 @@
SECTIONS
{
/* The exporter will patch this section to enclose the data appended to the executable (embedded PCK) */
pck 0 (INFO) : AT ( ADDR (.rodata) + SIZEOF (.rodata) )
{
/* binutils < 2.30 need some actual content for the linker not to discard the section */
BYTE(0);
}
}
INSERT AFTER .rodata;