Skip to content

Commit 972b47a

Browse files
committed
use flags in env
1 parent 66a88ea commit 972b47a

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

tools/cmake.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,13 @@ def GenerateCFiles(env, project, project_name):
4545
OBJDUMP = tool_path_conv["CMAKE_OBJDUMP"]["path"]
4646
OBJCOPY = tool_path_conv["CMAKE_OBJCOPY"]["path"]
4747
FROMELF = tool_path_conv["CMAKE_FROMELF"]["path"]
48-
49-
CFLAGS = rtconfig.CFLAGS
50-
for group in project:
51-
if 'CFLAGS' in group.keys():
52-
CFLAGS += ' ' + group['CFLAGS']
53-
CFLAGS = CFLAGS.replace('\\', "/").replace('\"', "\\\"")
48+
49+
CFLAGS = env['CFLAGS'].replace('\\', "/").replace('\"', "\\\"")
5450
if 'CXXFLAGS' in dir(rtconfig):
55-
CXXFLAGS = rtconfig.CXXFLAGS
56-
for group in project:
57-
if 'CXXFLAGS' in group.keys():
58-
CXXFLAGS +='' + group['CXXFLAGS']
59-
CXXFLAGS = CXXFLAGS.replace('\\', "/").replace('\"', "\\\"")
51+
CXXFLAGS = env['CXXFLAGS'].replace('\\', "/").replace('\"', "\\\"")
6052
else:
6153
CXXFLAGS = CFLAGS
62-
AFLAGS = rtconfig.AFLAGS.replace('\\', "/").replace('\"', "\\\"")
54+
AFLAGS = env['ASFLAGS'].replace('\\', "/").replace('\"', "\\\"")
6355
LFLAGS = env['LINKFLAGS'].replace('\\', "/").replace('\"', "\\\"")
6456

6557
POST_ACTION = rtconfig.POST_ACTION

0 commit comments

Comments
 (0)