Skip to content

Commit

Permalink
SCons: add methods.using_clang to check used compiler
Browse files Browse the repository at this point in the history
Also rename `use_gcc` to `using_gcc` to make it clear that it returns
a config but does not alter it.
  • Loading branch information
akien-mga committed Apr 5, 2019
1 parent 6a33727 commit e4a9616
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -342,15 +342,15 @@ if selected_platform in platform_list:
shadow_local_warning = []
all_plus_warnings = ['-Wwrite-strings']

if methods.use_gcc(env):
if methods.using_gcc(env):
version = methods.get_compiler_version(env)
if version != None and version[0] >= '7':
shadow_local_warning = ['-Wshadow-local']
if (env["warnings"] == 'extra'):
# FIXME: enable -Wimplicit-fallthrough once #26135 is fixed
# FIXME: enable -Wclobbered once #26351 is fixed
env.Append(CCFLAGS=['-Wall', '-Wextra', '-Wno-implicit-fallthrough', '-Wno-unused-parameter'] + all_plus_warnings + shadow_local_warning)
if methods.use_gcc(env):
if methods.using_gcc(env):
env['CCFLAGS'] += ['-Wno-clobbered']

elif (env["warnings"] == 'all'):
Expand Down
5 changes: 4 additions & 1 deletion methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -668,5 +668,8 @@ def get_compiler_version(env):
else:
return None

def use_gcc(env):
def using_gcc(env):
return 'gcc' in os.path.basename(env["CC"])

def using_clang(env):
return 'clang' in os.path.basename(env["CC"])
1 change: 0 additions & 1 deletion platform/server/detect.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import os
import platform
import sys
from methods import get_compiler_version, use_gcc

# This file is mostly based on platform/x11/detect.py.
# If editing this file, make sure to apply relevant changes here too.
Expand Down
4 changes: 2 additions & 2 deletions platform/x11/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import platform
import sys
from compat import decode_utf8
from methods import get_compiler_version, use_gcc
from methods import get_compiler_version, using_gcc

def is_active():
return True
Expand Down Expand Up @@ -160,7 +160,7 @@ def configure(env):
env.Append(LINKFLAGS=['-pipe'])

# Check for gcc version >= 6 before adding -no-pie
if use_gcc(env):
if using_gcc(env):
version = get_compiler_version(env)
if version != None and version[0] >= '6':
env.Append(CCFLAGS=['-fpie'])
Expand Down

0 comments on commit e4a9616

Please sign in to comment.