Merge pull request #3364 from BernardXiong/gcc_version
[Tools] rename GCC_VERSION to GCC_VERSION_STR
This commit is contained in:
commit
4cffe19dfe
14
tools/gcc.py
14
tools/gcc.py
|
@ -23,7 +23,7 @@
|
|||
|
||||
import os
|
||||
import re
|
||||
import platform
|
||||
import platform
|
||||
|
||||
def GetGCCRoot(rtconfig):
|
||||
exec_path = rtconfig.EXEC_PATH
|
||||
|
@ -63,7 +63,7 @@ def CheckHeader(rtconfig, filename):
|
|||
fn = os.path.join(root, prefix, 'include', filename)
|
||||
if os.path.isfile(fn):
|
||||
return True
|
||||
|
||||
|
||||
return False
|
||||
|
||||
def GetNewLibVersion(rtconfig):
|
||||
|
@ -98,18 +98,18 @@ def GCCResult(rtconfig, str):
|
|||
|
||||
gcc_cmd = os.path.join(rtconfig.EXEC_PATH, rtconfig.CC)
|
||||
|
||||
# use temp file to get more information
|
||||
# use temp file to get more information
|
||||
f = open('__tmp.c', 'w')
|
||||
if f:
|
||||
f.write(str)
|
||||
f.close()
|
||||
|
||||
# '-fdirectives-only',
|
||||
# '-fdirectives-only',
|
||||
if(platform.system() == 'Windows'):
|
||||
child = subprocess.Popen([gcc_cmd, '-E', '-P', '__tmp.c'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
|
||||
else:
|
||||
child = subprocess.Popen(gcc_cmd + ' -E -P __tmp.c', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
|
||||
|
||||
|
||||
stdout, stderr = child.communicate()
|
||||
|
||||
# print(stdout)
|
||||
|
@ -148,7 +148,7 @@ def GCCResult(rtconfig, str):
|
|||
|
||||
if re.findall('pthread_create', line):
|
||||
posix_thread = 1
|
||||
|
||||
|
||||
if have_fdset:
|
||||
result += '#define HAVE_FDSET 1\n'
|
||||
|
||||
|
@ -162,7 +162,7 @@ def GCCResult(rtconfig, str):
|
|||
result += '#define HAVE_SIGVAL 1\n'
|
||||
|
||||
if version:
|
||||
result += '#define GCC_VERSION "%s"\n' % version
|
||||
result += '#define GCC_VERSION_STR "%s"\n' % version
|
||||
|
||||
result += '#define STDC "%s"\n' % stdc
|
||||
|
||||
|
|
Loading…
Reference in New Issue