maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #23669 from marcelofg55/gcc_55_fix

Browse source 
Fix compile recent compile issues with gcc 5.5
This commit is contained in:
Rémi Verschelde 2018-11-12 15:46:50 +01:00 committed by GitHub
parent baa8678d2a 8705c01f5a
commit 0357d31530
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/x11/detect.py
View file

@ -149,7 +149,7 @@ def configure(env):
env.Append(CCFLAGS=['-pipe'])
env.Append(LINKFLAGS=['-pipe'])
# Check for gcc version > 4 before adding -no-pie
# Check for gcc version > 5 before adding -no-pie
import re
import subprocess
proc = subprocess.Popen([env['CXX'], '--version'], stdout=subprocess.PIPE)
@ -157,7 +157,7 @@ def configure(env):
match = re.search('[0-9][0-9.]*', stdout)
if match is not None:
version = match.group().split('.')
if (version[0] > '4'):
if (version[0] > '5'):
env.Append(CCFLAGS=['-fpie'])
env.Append(LINKFLAGS=['-no-pie'])