Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
2b91ec75
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
1 年多 前同步成功
通知
10
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
2b91ec75
编写于
2月 12, 2016
作者:
R
Rich Salz
提交者:
Rich Salz
2月 12, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Put user flags last for priority.
Reviewed-by:
N
Richard Levitte
<
levitte@openssl.org
>
上级
57758351
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
8 deletion
+10
-8
Configure
Configure
+10
-8
未找到文件。
Configure
浏览文件 @
2b91ec75
...
@@ -643,7 +643,7 @@ foreach (@argvcopy)
...
@@ -643,7 +643,7 @@ foreach (@argvcopy)
else
# common if (/^[-+]/), just pass down...
else
# common if (/^[-+]/), just pass down...
{
{
$_
=~
s/%([0-9a-f]{1,2})/chr(hex($1))/g
ei
;
$_
=~
s/%([0-9a-f]{1,2})/chr(hex($1))/g
ei
;
$user_cflags
.=
$_
.
"
"
;
$user_cflags
.=
"
"
.
$_
;
}
}
}
}
elsif
(
$_
=~
/^([^:]+):(.+)$/
)
elsif
(
$_
=~
/^([^:]+):(.+)$/
)
...
@@ -887,10 +887,10 @@ my $no_shared_warn=0;
...
@@ -887,10 +887,10 @@ my $no_shared_warn=0;
my
$no_user_cflags
=
0
;
my
$no_user_cflags
=
0
;
my
$no_user_defines
=
0
;
my
$no_user_defines
=
0
;
if
(
$user_cflags
ne
"")
{
$config
{
cflags
}
=
"
$user_cflags$config
{cflags}
";
}
if
(
$user_cflags
ne
"")
{
$config
{
cflags
}
=
"
$config
{cflags}
$user_cflags
";
}
else
{
$no_user_cflags
=
1
;
}
else
{
$no_user_cflags
=
1
;
}
if
(
@user_defines
)
{
$config
{
defines
}
=
[
@user_defines
,
@
{
$config
{
defines
}}
];
}
if
(
@user_defines
)
{
$config
{
defines
}
=
[
@
{
$config
{
defines
}},
@user_defines
];
}
else
{
$no_user_defines
=
1
;
}
else
{
$no_user_defines
=
1
;
}
# The DSO code currently always implements all functions so that no
# The DSO code currently always implements all functions so that no
# applications will have to worry about that from a compilation point
# applications will have to worry about that from a compilation point
...
@@ -1141,30 +1141,32 @@ if (defined($config{api})) {
...
@@ -1141,30 +1141,32 @@ if (defined($config{api})) {
if
(
$strict_warnings
)
if
(
$strict_warnings
)
{
{
my
$wopt
;
my
$wopt
;
my
$addflags
=
'';
die
"
ERROR --strict-warnings requires gcc or clang
"
die
"
ERROR --strict-warnings requires gcc or clang
"
unless
$ecc
eq
'
gcc
'
||
$ecc
eq
'
clang
';
unless
$ecc
eq
'
gcc
'
||
$ecc
eq
'
clang
';
foreach
$wopt
(
split
/\s+/
,
$gcc_devteam_warn
)
foreach
$wopt
(
split
/\s+/
,
$gcc_devteam_warn
)
{
{
$
config
{
cflags
}
.=
"
$wopt
"
unless
(
$config
{
cflags
}
=~
/(^|\s)$wopt(\s|$)/
)
$
addflags
.=
"
$wopt
"
unless
(
$config
{
cflags
}
=~
/(^|\s)$wopt(\s|$)/
)
}
}
if
(
$ecc
eq
"
clang
")
if
(
$ecc
eq
"
clang
")
{
{
foreach
$wopt
(
split
/\s+/
,
$clang_devteam_warn
)
foreach
$wopt
(
split
/\s+/
,
$clang_devteam_warn
)
{
{
$
config
{
cflags
}
.=
"
$wopt
"
unless
(
$config
{
cflags
}
=~
/(^|\s)$wopt(\s|$)/
)
$
addflags
.=
"
$wopt
"
unless
(
$config
{
cflags
}
=~
/(^|\s)$wopt(\s|$)/
)
}
}
}
}
if
(
$target
!~
/^mingw/
)
if
(
$target
!~
/^mingw/
)
{
{
foreach
$wopt
(
split
/\s+/
,
$memleak_devteam_backtrace
)
foreach
$wopt
(
split
/\s+/
,
$memleak_devteam_backtrace
)
{
{
$
config
{
cflags
}
.=
"
$wopt
"
unless
(
$config
{
cflags
}
=~
/(^|\s)$wopt(\s|$)/
)
$
addflags
.=
"
$wopt
"
unless
(
$config
{
cflags
}
=~
/(^|\s)$wopt(\s|$)/
)
}
}
if
(
$target
=~
/^BSD-/
)
if
(
$target
=~
/^BSD-/
)
{
{
$config
{
ex_libs
}
.=
"
-lexecinfo
";
$config
{
ex_libs
}
.=
"
-lexecinfo
";
}
}
}
}
$config
{
cflags
}
=
"
$addflags
$config
{cflags}
"
if
$addflags
ne
'';
}
}
# If we use the unified build, collect information from build.info files
# If we use the unified build, collect information from build.info files
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录