From 835504ed956bd6528cbd473ae2fe4b0f650c7188 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Fri, 7 Feb 2020 15:55:53 +0800 Subject: [PATCH] [Tools] rename GCC_VERSION to GCC_VERSION_STR --- tools/gcc.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/gcc.py b/tools/gcc.py index 2e29c8f34b..8c9685d52b 100644 --- a/tools/gcc.py +++ b/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