Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
9a154a94
R
Rust
项目概览
int
/
Rust
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
9a154a94
编写于
1月 24, 2020
作者:
T
Tomasz Miąsko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
compiletest: Remove unused llvm-cxxflags option
上级
d857f6f1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
1 addition
and
11 deletion
+1
-11
src/bootstrap/test.rs
src/bootstrap/test.rs
+1
-6
src/tools/compiletest/src/common.rs
src/tools/compiletest/src/common.rs
+0
-1
src/tools/compiletest/src/header/tests.rs
src/tools/compiletest/src/header/tests.rs
+0
-1
src/tools/compiletest/src/main.rs
src/tools/compiletest/src/main.rs
+0
-2
src/tools/compiletest/src/runtest.rs
src/tools/compiletest/src/runtest.rs
+0
-1
未找到文件。
src/bootstrap/test.rs
浏览文件 @
9a154a94
...
...
@@ -1149,7 +1149,6 @@ fn run(self, builder: &Builder<'_>) {
// requires that a C++ compiler was configured which isn't always the case.
if
!
builder
.config.dry_run
&&
suite
==
"run-make-fulldeps"
{
let
llvm_components
=
output
(
Command
::
new
(
&
llvm_config
)
.arg
(
"--components"
));
let
llvm_cxxflags
=
output
(
Command
::
new
(
&
llvm_config
)
.arg
(
"--cxxflags"
));
cmd
.arg
(
"--cc"
)
.arg
(
builder
.cc
(
target
))
.arg
(
"--cxx"
)
...
...
@@ -1157,9 +1156,7 @@ fn run(self, builder: &Builder<'_>) {
.arg
(
"--cflags"
)
.arg
(
builder
.cflags
(
target
,
GitRepo
::
Rustc
)
.join
(
" "
))
.arg
(
"--llvm-components"
)
.arg
(
llvm_components
.trim
())
.arg
(
"--llvm-cxxflags"
)
.arg
(
llvm_cxxflags
.trim
());
.arg
(
llvm_components
.trim
());
if
let
Some
(
ar
)
=
builder
.ar
(
target
)
{
cmd
.arg
(
"--ar"
)
.arg
(
ar
);
}
...
...
@@ -1197,8 +1194,6 @@ fn run(self, builder: &Builder<'_>) {
.arg
(
"--cflags"
)
.arg
(
""
)
.arg
(
"--llvm-components"
)
.arg
(
""
)
.arg
(
"--llvm-cxxflags"
)
.arg
(
""
);
}
...
...
src/tools/compiletest/src/common.rs
浏览文件 @
9a154a94
...
...
@@ -319,7 +319,6 @@ pub struct Config {
pub
ar
:
String
,
pub
linker
:
Option
<
String
>
,
pub
llvm_components
:
String
,
pub
llvm_cxxflags
:
String
,
/// Path to a NodeJS executable. Used for JS doctests, emscripten and WASM tests
pub
nodejs
:
Option
<
String
>
,
...
...
src/tools/compiletest/src/header/tests.rs
浏览文件 @
9a154a94
...
...
@@ -45,7 +45,6 @@ fn config() -> Config {
"--cxx=c++"
,
"--cflags="
,
"--llvm-components="
,
"--llvm-cxxflags="
,
"--android-cross-path="
,
"--target=x86_64-unknown-linux-gnu"
,
];
...
...
src/tools/compiletest/src/main.rs
浏览文件 @
9a154a94
...
...
@@ -116,7 +116,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
.optopt
(
""
,
"ar"
,
"path to an archiver"
,
"PATH"
)
.optopt
(
""
,
"linker"
,
"path to a linker"
,
"PATH"
)
.reqopt
(
""
,
"llvm-components"
,
"list of LLVM components built in"
,
"LIST"
)
.reqopt
(
""
,
"llvm-cxxflags"
,
"C++ flags for LLVM"
,
"FLAGS"
)
.optopt
(
""
,
"llvm-bin-dir"
,
"Path to LLVM's `bin` directory"
,
"PATH"
)
.optopt
(
""
,
"nodejs"
,
"the name of nodejs"
,
"PATH"
)
.optopt
(
""
,
"remote-test-client"
,
"path to the remote test client"
,
"PATH"
)
...
...
@@ -240,7 +239,6 @@ fn make_absolute(path: PathBuf) -> PathBuf {
ar
:
matches
.opt_str
(
"ar"
)
.unwrap_or
(
"ar"
.into
()),
linker
:
matches
.opt_str
(
"linker"
),
llvm_components
:
matches
.opt_str
(
"llvm-components"
)
.unwrap
(),
llvm_cxxflags
:
matches
.opt_str
(
"llvm-cxxflags"
)
.unwrap
(),
nodejs
:
matches
.opt_str
(
"nodejs"
),
}
}
...
...
src/tools/compiletest/src/runtest.rs
浏览文件 @
9a154a94
...
...
@@ -2651,7 +2651,6 @@ fn run_rmake_test(&self) {
.env
(
"HOST_RPATH_DIR"
,
cwd
.join
(
&
self
.config.compile_lib_path
))
.env
(
"TARGET_RPATH_DIR"
,
cwd
.join
(
&
self
.config.run_lib_path
))
.env
(
"LLVM_COMPONENTS"
,
&
self
.config.llvm_components
)
.env
(
"LLVM_CXXFLAGS"
,
&
self
.config.llvm_cxxflags
)
// We for sure don't want these tests to run in parallel, so make
// sure they don't have access to these vars if we run via `make`
// at the top level
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录