mirror of
https://github.com/godotengine/godot
synced 2024-09-05 21:29:51 +00:00
Come up with use_gcc.
Add new method. Fix wrong version condition for -fpie.
This commit is contained in:
parent
4f697f73a5
commit
0d2a105e6b
|
@ -338,7 +338,7 @@ if selected_platform in platform_list:
|
|||
disable_nonessential_warnings = ['-Wno-sign-compare']
|
||||
shadow_local_warning = []
|
||||
|
||||
if 'gcc' in os.path.basename(env["CC"]):
|
||||
if methods.use_gcc(env):
|
||||
version = methods.get_compiler_version(env)
|
||||
if version != None and version[0] >= '7':
|
||||
shadow_local_warning = ['-Wshadow-local']
|
||||
|
|
|
@ -667,3 +667,6 @@ def get_compiler_version(env):
|
|||
return match.group().split('.')
|
||||
else:
|
||||
return None
|
||||
|
||||
def use_gcc(env):
|
||||
return 'gcc' in os.path.basename(env["CC"])
|
||||
|
|
|
@ -2,7 +2,7 @@ import os
|
|||
import platform
|
||||
import sys
|
||||
from compat import decode_utf8
|
||||
from methods import get_compiler_version
|
||||
from methods import get_compiler_version, use_gcc
|
||||
|
||||
def is_active():
|
||||
return True
|
||||
|
@ -162,8 +162,9 @@ def configure(env):
|
|||
env.Append(LINKFLAGS=['-pipe'])
|
||||
|
||||
# Check for gcc version >= 6 before adding -no-pie
|
||||
if use_gcc(env):
|
||||
version = get_compiler_version(env)
|
||||
if version != None and version[0] > '6':
|
||||
if version != None and version[0] >= '6':
|
||||
env.Append(CCFLAGS=['-fpie'])
|
||||
env.Append(LINKFLAGS=['-no-pie'])
|
||||
|
||||
|
|
Loading…
Reference in a new issue