Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
1a844ebb
R
Rust
项目概览
int
/
Rust
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1a844ebb
编写于
7月 05, 2017
作者:
M
Mark Simulacrum
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move tool_cmd to tool.rs
上级
60388303
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
41 addition
and
39 deletion
+41
-39
src/bootstrap/lib.rs
src/bootstrap/lib.rs
+0
-39
src/bootstrap/tool.rs
src/bootstrap/tool.rs
+41
-0
未找到文件。
src/bootstrap/lib.rs
浏览文件 @
1a844ebb
...
...
@@ -549,45 +549,6 @@ fn rustdoc(&self, compiler: Compiler) -> PathBuf {
rustdoc
}
/// Get a `Command` which is ready to run `tool` in `stage` built for
/// `host`.
fn
tool_cmd
(
&
self
,
compiler
:
Compiler
,
tool
:
&
str
)
->
Command
{
let
mut
cmd
=
Command
::
new
(
self
.tool
(
compiler
,
tool
));
self
.prepare_tool_cmd
(
compiler
,
&
mut
cmd
);
cmd
}
/// Prepares the `cmd` provided to be able to run the `compiler` provided.
///
/// Notably this munges the dynamic library lookup path to point to the
/// right location to run `compiler`.
fn
prepare_tool_cmd
(
&
self
,
compiler
:
Compiler
,
cmd
:
&
mut
Command
)
{
let
host
=
compiler
.host
;
let
mut
paths
=
vec!
[
self
.sysroot_libdir
(
compiler
,
compiler
.host
),
self
.cargo_out
(
compiler
,
Mode
::
Tool
,
host
)
.join
(
"deps"
),
];
// On MSVC a tool may invoke a C compiler (e.g. compiletest in run-make
// mode) and that C compiler may need some extra PATH modification. Do
// so here.
if
compiler
.host
.contains
(
"msvc"
)
{
let
curpaths
=
env
::
var_os
(
"PATH"
)
.unwrap_or
(
OsString
::
new
());
let
curpaths
=
env
::
split_paths
(
&
curpaths
)
.collect
::
<
Vec
<
_
>>
();
for
&
(
ref
k
,
ref
v
)
in
self
.cc
[
compiler
.host
]
.0
.env
()
{
if
k
!=
"PATH"
{
continue
}
for
path
in
env
::
split_paths
(
v
)
{
if
!
curpaths
.contains
(
&
path
)
{
paths
.push
(
path
);
}
}
}
}
add_lib_path
(
paths
,
cmd
);
}
/// Get the space-separated set of activated features for the standard
/// library.
fn
std_features
(
&
self
)
->
String
{
...
...
src/bootstrap/tool.rs
浏览文件 @
1a844ebb
...
...
@@ -369,3 +369,44 @@ fn run(self, builder: &Builder) -> PathBuf {
})
}
}
impl
<
'a
>
Builder
<
'a
>
{
/// Get a `Command` which is ready to run `tool` in `stage` built for
/// `host`.
fn
tool_cmd
(
&
self
,
compiler
:
Compiler
,
tool
:
&
str
)
->
Command
{
let
mut
cmd
=
Command
::
new
(
self
.tool
(
compiler
,
tool
));
self
.prepare_tool_cmd
(
compiler
,
&
mut
cmd
);
cmd
}
/// Prepares the `cmd` provided to be able to run the `compiler` provided.
///
/// Notably this munges the dynamic library lookup path to point to the
/// right location to run `compiler`.
fn
prepare_tool_cmd
(
&
self
,
compiler
:
Compiler
,
cmd
:
&
mut
Command
)
{
let
host
=
compiler
.host
;
let
mut
paths
=
vec!
[
self
.sysroot_libdir
(
compiler
,
compiler
.host
),
self
.cargo_out
(
compiler
,
Mode
::
Tool
,
host
)
.join
(
"deps"
),
];
// On MSVC a tool may invoke a C compiler (e.g. compiletest in run-make
// mode) and that C compiler may need some extra PATH modification. Do
// so here.
if
compiler
.host
.contains
(
"msvc"
)
{
let
curpaths
=
env
::
var_os
(
"PATH"
)
.unwrap_or
(
OsString
::
new
());
let
curpaths
=
env
::
split_paths
(
&
curpaths
)
.collect
::
<
Vec
<
_
>>
();
for
&
(
ref
k
,
ref
v
)
in
self
.cc
[
compiler
.host
]
.0
.env
()
{
if
k
!=
"PATH"
{
continue
}
for
path
in
env
::
split_paths
(
v
)
{
if
!
curpaths
.contains
(
&
path
)
{
paths
.push
(
path
);
}
}
}
}
add_lib_path
(
paths
,
cmd
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录