diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-12 15:46:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 15:46:50 +0100 |
| commit | 0357d315305d3c98e97b13ee8ac3f19227f5541b (patch) | |
| tree | 879c4098ca1d6f9d240abed9eea67929278d8ec5 /platform | |
| parent | baa8678d2a8b4564b984d869e737f94f5720ff54 (diff) | |
| parent | 8705c01f5a811609322a3004e187e767c102ae03 (diff) | |
Merge pull request #23669 from marcelofg55/gcc_55_fix
Fix compile recent compile issues with gcc 5.5
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/x11/detect.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index dc5c22b4b3..e257a20bdd 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -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']) |