Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76519099
rt-thread
提交
099062de
R
rt-thread
项目概览
2301_76519099
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
3
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
099062de
编写于
6月 04, 2018
作者:
A
ArdaFu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[tools][building] Add ASFLAGS in DefineGroup.
上级
7a1f8ee1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
3 deletion
+20
-3
libcpu/SConscript
libcpu/SConscript
+5
-1
tools/building.py
tools/building.py
+15
-2
未找到文件。
libcpu/SConscript
浏览文件 @
099062de
...
...
@@ -4,6 +4,7 @@ from building import *
comm
=
rtconfig
.
ARCH
+
'/common'
path
=
rtconfig
.
ARCH
+
'/'
+
rtconfig
.
CPU
AFLAGS
=
''
# The set of source files associated with this SConscript file.
if
rtconfig
.
PLATFORM
==
'armcc'
:
...
...
@@ -21,7 +22,10 @@ if rtconfig.PLATFORM == 'cl':
if
rtconfig
.
PLATFORM
==
'mingw'
:
src
=
Glob
(
path
+
'/*.c'
)
if
rtconfig
.
PLATFORM
==
'armcc'
and
rtconfig
.
ARCH
==
'arm'
and
rtconfig
.
CPU
==
'arm926'
:
ASFLAGS
=
' --cpreproc'
CPPPATH
=
[
RTT_ROOT
+
'/libcpu/'
+
rtconfig
.
ARCH
+
'/'
+
rtconfig
.
CPU
,
RTT_ROOT
+
'/libcpu/'
+
rtconfig
.
ARCH
+
'/common'
]
group
=
DefineGroup
(
rtconfig
.
CPU
.
upper
(),
src
,
depend
=
[
''
],
CPPPATH
=
CPPPATH
)
group
=
DefineGroup
(
rtconfig
.
CPU
.
upper
(),
src
,
depend
=
[
''
],
CPPPATH
=
CPPPATH
,
ASFLAGS
=
ASFLAGS
)
Return
(
'group'
)
tools/building.py
浏览文件 @
099062de
...
...
@@ -487,6 +487,11 @@ def MergeGroup(src_group, group):
src_group
[
'CPPDEFINES'
]
=
src_group
[
'CPPDEFINES'
]
+
group
[
'CPPDEFINES'
]
else
:
src_group
[
'CPPDEFINES'
]
=
group
[
'CPPDEFINES'
]
if
group
.
has_key
(
'ASFLAGS'
):
if
src_group
.
has_key
(
'ASFLAGS'
):
src_group
[
'ASFLAGS'
]
=
src_group
[
'ASFLAGS'
]
+
group
[
'ASFLAGS'
]
else
:
src_group
[
'ASFLAGS'
]
=
group
[
'ASFLAGS'
]
# for local CCFLAGS/CPPPATH/CPPDEFINES
if
group
.
has_key
(
'LOCAL_CCFLAGS'
):
...
...
@@ -520,6 +525,11 @@ def MergeGroup(src_group, group):
src_group
[
'LIBPATH'
]
=
src_group
[
'LIBPATH'
]
+
group
[
'LIBPATH'
]
else
:
src_group
[
'LIBPATH'
]
=
group
[
'LIBPATH'
]
if
group
.
has_key
(
'LOCAL_ASFLAGS'
):
if
src_group
.
has_key
(
'LOCAL_ASFLAGS'
):
src_group
[
'LOCAL_ASFLAGS'
]
=
src_group
[
'LOCAL_ASFLAGS'
]
+
group
[
'LOCAL_ASFLAGS'
]
else
:
src_group
[
'LOCAL_ASFLAGS'
]
=
group
[
'LOCAL_ASFLAGS'
]
def
DefineGroup
(
name
,
src
,
depend
,
**
parameters
):
global
Env
...
...
@@ -550,6 +560,8 @@ def DefineGroup(name, src, depend, **parameters):
Env
.
AppendUnique
(
CPPDEFINES
=
group
[
'CPPDEFINES'
])
if
group
.
has_key
(
'LINKFLAGS'
):
Env
.
AppendUnique
(
LINKFLAGS
=
group
[
'LINKFLAGS'
])
if
group
.
has_key
(
'ASFLAGS'
):
Env
.
AppendUnique
(
ASFLAGS
=
group
[
'ASFLAGS'
])
# check whether to clean up library
if
GetOption
(
'cleanlib'
)
and
os
.
path
.
exists
(
os
.
path
.
join
(
group
[
'path'
],
GroupLibFullName
(
name
,
Env
))):
...
...
@@ -645,13 +657,14 @@ def DoBuilding(target, objects):
# handle local group
def
local_group
(
group
,
objects
):
if
group
.
has_key
(
'LOCAL_CCFLAGS'
)
or
group
.
has_key
(
'LOCAL_CPPPATH'
)
or
group
.
has_key
(
'LOCAL_CPPDEFINES'
):
if
group
.
has_key
(
'LOCAL_CCFLAGS'
)
or
group
.
has_key
(
'LOCAL_CPPPATH'
)
or
group
.
has_key
(
'LOCAL_CPPDEFINES'
)
or
group
.
has_key
(
'LOCAL_ASFLAGS'
)
:
CCFLAGS
=
Env
.
get
(
'CCFLAGS'
,
''
)
+
group
.
get
(
'LOCAL_CCFLAGS'
,
''
)
CPPPATH
=
Env
.
get
(
'CPPPATH'
,
[
''
])
+
group
.
get
(
'LOCAL_CPPPATH'
,
[
''
])
CPPDEFINES
=
Env
.
get
(
'CPPDEFINES'
,
[
''
])
+
group
.
get
(
'LOCAL_CPPDEFINES'
,
[
''
])
ASFLAGS
=
Env
.
get
(
'ASFLAGS'
,
''
)
+
group
.
get
(
'LOCAL_ASFLAGS'
,
''
)
for
source
in
group
[
'src'
]:
objects
.
append
(
Env
.
Object
(
source
,
CCFLAGS
=
CCFLAGS
,
objects
.
append
(
Env
.
Object
(
source
,
CCFLAGS
=
CCFLAGS
,
ASFLAGS
=
ASFLAGS
,
CPPPATH
=
CPPPATH
,
CPPDEFINES
=
CPPDEFINES
))
return
True
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录