Merge pull request #26160 from marxin/come-up-with-use_gcc

Come up with use_gcc.

SConstruct

@@ -339,7 +339,7 @@ if selected_platform in platform_list:
         shadow_local_warning = []
         all_plus_warnings = ['-Wwrite-strings']
 
-        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']

methods.py

@@ -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"])

platform/x11/detect.py

@@ -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,10 +162,11 @@ def configure(env):
     env.Append(LINKFLAGS=['-pipe'])
 
     # Check for gcc version >= 6 before adding -no-pie
-    version = get_compiler_version(env)
-    if version != None and version[0] > '6':
-        env.Append(CCFLAGS=['-fpie'])
-        env.Append(LINKFLAGS=['-no-pie'])
+    if use_gcc(env):
+        version = get_compiler_version(env)
+        if version != None and version[0] >= '6':
+            env.Append(CCFLAGS=['-fpie'])
+            env.Append(LINKFLAGS=['-no-pie'])
 
     ## Dependencies