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

Merge pull request #23542 from marcelofg55/no_pie

Browse source 
Fix binaries incorrectly detected as shared libraries on some linux distros
This commit is contained in:
Rémi Verschelde 2018-11-09 16:12:16 +01:00 committed by GitHub
commit 06c42d151c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
platform/x11/detect.py
View file

@ -149,6 +149,18 @@ def configure(env):
env.Append(CCFLAGS=['-pipe']) env.Append(CCFLAGS=['-pipe'])
env.Append(LINKFLAGS=['-pipe']) env.Append(LINKFLAGS=['-pipe'])
# Check for gcc version > 4 before adding -no-pie
import re
import subprocess
proc = subprocess.Popen([env['CXX'], '--version'], stdout=subprocess.PIPE)
(stdout, _) = proc.communicate()
match = re.search('[0-9][0-9.]*', stdout)
if match is not None:
version = match.group().split('.')
if (version[0] > '4'):
env.Append(CCFLAGS=['-fpie'])
env.Append(LINKFLAGS=['-no-pie'])
## Dependencies ## Dependencies
env.ParseConfig('pkg-config x11 --cflags --libs') env.ParseConfig('pkg-config x11 --cflags --libs')