Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
dc7524be
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,发现更多精彩内容 >>
提交
dc7524be
编写于
5月 09, 2020
作者:
R
Ralf Jung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove lldb package from bootstrap, config and build-manifest
it's not been built since a long time ago
上级
34d6b446
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
7 addition
and
184 deletion
+7
-184
config.toml.example
config.toml.example
+0
-4
src/bootstrap/builder.rs
src/bootstrap/builder.rs
+0
-1
src/bootstrap/config.rs
src/bootstrap/config.rs
+0
-3
src/bootstrap/configure.py
src/bootstrap/configure.py
+0
-1
src/bootstrap/dist.rs
src/bootstrap/dist.rs
+0
-121
src/bootstrap/lib.rs
src/bootstrap/lib.rs
+0
-8
src/bootstrap/native.rs
src/bootstrap/native.rs
+4
-12
src/bootstrap/sanity.rs
src/bootstrap/sanity.rs
+0
-8
src/bootstrap/test.rs
src/bootstrap/test.rs
+3
-8
src/tools/build-manifest/src/main.rs
src/tools/build-manifest/src/main.rs
+0
-18
未找到文件。
config.toml.example
浏览文件 @
dc7524be
...
...
@@ -411,10 +411,6 @@
# sysroot.
#llvm-tools = false
# Indicates whether LLDB will be made available in the sysroot.
# This is only built if LLVM is also being built.
#lldb = false
# Whether to deny warnings in crates
#deny-warnings = true
...
...
src/bootstrap/builder.rs
浏览文件 @
dc7524be
...
...
@@ -441,7 +441,6 @@ fn get_step_descriptions(kind: Kind) -> Vec<StepDescription> {
dist
::
Clippy
,
dist
::
Miri
,
dist
::
LlvmTools
,
dist
::
Lldb
,
dist
::
Extended
,
dist
::
HashSign
),
...
...
src/bootstrap/config.rs
浏览文件 @
dc7524be
...
...
@@ -85,7 +85,6 @@ pub struct Config {
pub
use_lld
:
bool
,
pub
lld_enabled
:
bool
,
pub
lldb_enabled
:
bool
,
pub
llvm_tools_enabled
:
bool
,
pub
llvm_cflags
:
Option
<
String
>
,
...
...
@@ -337,7 +336,6 @@ struct Rust {
lld
:
Option
<
bool
>
,
use_lld
:
Option
<
bool
>
,
llvm_tools
:
Option
<
bool
>
,
lldb
:
Option
<
bool
>
,
deny_warnings
:
Option
<
bool
>
,
backtrace_on_ice
:
Option
<
bool
>
,
verify_llvm_ir
:
Option
<
bool
>
,
...
...
@@ -585,7 +583,6 @@ pub fn parse(args: &[String]) -> Config {
}
set
(
&
mut
config
.use_lld
,
rust
.use_lld
);
set
(
&
mut
config
.lld_enabled
,
rust
.lld
);
set
(
&
mut
config
.lldb_enabled
,
rust
.lldb
);
set
(
&
mut
config
.llvm_tools_enabled
,
rust
.llvm_tools
);
config
.rustc_parallel
=
rust
.parallel_compiler
.unwrap_or
(
false
);
config
.rustc_default_linker
=
rust
.default_linker
.clone
();
...
...
src/bootstrap/configure.py
浏览文件 @
dc7524be
...
...
@@ -57,7 +57,6 @@ o("cargo-native-static", "build.cargo-native-static", "static native libraries i
o
(
"profiler"
,
"build.profiler"
,
"build the profiler runtime"
)
o
(
"full-tools"
,
None
,
"enable all tools"
)
o
(
"lld"
,
"rust.lld"
,
"build lld"
)
o
(
"lldb"
,
"rust.lldb"
,
"build lldb"
)
o
(
"missing-tools"
,
"dist.missing-tools"
,
"allow failures when building tools"
)
o
(
"use-libcxx"
,
"llvm.use-libcxx"
,
"build LLVM with libc++"
)
o
(
"control-flow-guard"
,
"rust.control-flow-guard"
,
"Enable Control Flow Guard"
)
...
...
src/bootstrap/dist.rs
浏览文件 @
dc7524be
...
...
@@ -38,8 +38,6 @@ pub fn pkgname(builder: &Builder<'_>, component: &str) -> String {
format!
(
"{}-{}"
,
component
,
builder
.rustfmt_package_vers
())
}
else
if
component
==
"llvm-tools"
{
format!
(
"{}-{}"
,
component
,
builder
.llvm_tools_package_vers
())
}
else
if
component
==
"lldb"
{
format!
(
"{}-{}"
,
component
,
builder
.lldb_package_vers
())
}
else
{
assert
!
(
component
.starts_with
(
"rust"
));
format!
(
"{}-{}"
,
component
,
builder
.rust_package_vers
())
...
...
@@ -1645,7 +1643,6 @@ fn run(self, builder: &Builder<'_>) {
let
llvm_tools_installer
=
builder
.ensure
(
LlvmTools
{
target
});
let
clippy_installer
=
builder
.ensure
(
Clippy
{
compiler
,
target
});
let
miri_installer
=
builder
.ensure
(
Miri
{
compiler
,
target
});
let
lldb_installer
=
builder
.ensure
(
Lldb
{
target
});
let
mingw_installer
=
builder
.ensure
(
Mingw
{
host
:
target
});
let
analysis_installer
=
builder
.ensure
(
Analysis
{
compiler
,
target
});
...
...
@@ -1681,7 +1678,6 @@ fn run(self, builder: &Builder<'_>) {
tarballs
.extend
(
miri_installer
.clone
());
tarballs
.extend
(
rustfmt_installer
.clone
());
tarballs
.extend
(
llvm_tools_installer
);
tarballs
.extend
(
lldb_installer
);
tarballs
.push
(
analysis_installer
);
tarballs
.push
(
std_installer
);
if
builder
.config.docs
{
...
...
@@ -2222,7 +2218,6 @@ fn run(self, builder: &Builder<'_>) {
cmd
.arg
(
builder
.package_vers
(
&
builder
.release_num
(
"miri"
)));
cmd
.arg
(
builder
.package_vers
(
&
builder
.release_num
(
"rustfmt"
)));
cmd
.arg
(
builder
.llvm_tools_package_vers
());
cmd
.arg
(
builder
.lldb_package_vers
());
builder
.create_dir
(
&
distdir
(
builder
));
...
...
@@ -2349,119 +2344,3 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
Some
(
distdir
(
builder
)
.join
(
format!
(
"{}-{}.tar.gz"
,
name
,
target
)))
}
}
#[derive(Clone,
Debug,
Eq,
Hash,
PartialEq)]
pub
struct
Lldb
{
pub
target
:
Interned
<
String
>
,
}
impl
Step
for
Lldb
{
type
Output
=
Option
<
PathBuf
>
;
const
ONLY_HOSTS
:
bool
=
true
;
const
DEFAULT
:
bool
=
true
;
fn
should_run
(
run
:
ShouldRun
<
'_
>
)
->
ShouldRun
<
'_
>
{
run
.path
(
"src/llvm-project/lldb"
)
.path
(
"src/tools/lldb"
)
}
fn
make_run
(
run
:
RunConfig
<
'_
>
)
{
run
.builder
.ensure
(
Lldb
{
target
:
run
.target
});
}
fn
run
(
self
,
builder
:
&
Builder
<
'_
>
)
->
Option
<
PathBuf
>
{
let
target
=
self
.target
;
if
builder
.config.dry_run
{
return
None
;
}
let
bindir
=
builder
.llvm_out
(
target
)
.join
(
"bin"
);
let
lldb_exe
=
bindir
.join
(
exe
(
"lldb"
,
&
target
));
if
!
lldb_exe
.exists
()
{
return
None
;
}
builder
.info
(
&
format!
(
"Dist Lldb ({})"
,
target
));
let
src
=
builder
.src
.join
(
"src/llvm-project/lldb"
);
let
name
=
pkgname
(
builder
,
"lldb"
);
let
tmp
=
tmpdir
(
builder
);
let
image
=
tmp
.join
(
"lldb-image"
);
drop
(
fs
::
remove_dir_all
(
&
image
));
// Prepare the image directory
let
root
=
image
.join
(
"lib/rustlib"
)
.join
(
&*
target
);
let
dst
=
root
.join
(
"bin"
);
t!
(
fs
::
create_dir_all
(
&
dst
));
for
program
in
&
[
"lldb"
,
"lldb-argdumper"
,
"lldb-mi"
,
"lldb-server"
]
{
let
exe
=
bindir
.join
(
exe
(
program
,
&
target
));
builder
.install
(
&
exe
,
&
dst
,
0o755
);
}
// The libraries.
let
libdir
=
builder
.llvm_out
(
target
)
.join
(
"lib"
);
let
dst
=
root
.join
(
"lib"
);
t!
(
fs
::
create_dir_all
(
&
dst
));
for
entry
in
t!
(
fs
::
read_dir
(
&
libdir
))
{
let
entry
=
entry
.unwrap
();
if
let
Ok
(
name
)
=
entry
.file_name
()
.into_string
()
{
if
name
.starts_with
(
"liblldb."
)
&&
!
name
.ends_with
(
".a"
)
{
if
t!
(
entry
.file_type
())
.is_symlink
()
{
builder
.copy_to_folder
(
&
entry
.path
(),
&
dst
);
}
else
{
builder
.install
(
&
entry
.path
(),
&
dst
,
0o755
);
}
}
}
}
// The lldb scripts might be installed in lib/python$version
// or in lib64/python$version. If lib64 exists, use it;
// otherwise lib.
let
libdir
=
builder
.llvm_out
(
target
)
.join
(
"lib64"
);
let
(
libdir
,
libdir_name
)
=
if
libdir
.exists
()
{
(
libdir
,
"lib64"
)
}
else
{
(
builder
.llvm_out
(
target
)
.join
(
"lib"
),
"lib"
)
};
for
entry
in
t!
(
fs
::
read_dir
(
&
libdir
))
{
let
entry
=
t!
(
entry
);
if
let
Ok
(
name
)
=
entry
.file_name
()
.into_string
()
{
if
name
.starts_with
(
"python"
)
{
let
dst
=
root
.join
(
libdir_name
)
.join
(
entry
.file_name
());
t!
(
fs
::
create_dir_all
(
&
dst
));
builder
.cp_r
(
&
entry
.path
(),
&
dst
);
break
;
}
}
}
// Prepare the overlay
let
overlay
=
tmp
.join
(
"lldb-overlay"
);
drop
(
fs
::
remove_dir_all
(
&
overlay
));
builder
.create_dir
(
&
overlay
);
builder
.install
(
&
src
.join
(
"LICENSE.TXT"
),
&
overlay
,
0o644
);
builder
.create
(
&
overlay
.join
(
"version"
),
&
builder
.lldb_vers
());
// Generate the installer tarball
let
mut
cmd
=
rust_installer
(
builder
);
cmd
.arg
(
"generate"
)
.arg
(
"--product-name=Rust"
)
.arg
(
"--rel-manifest-dir=rustlib"
)
.arg
(
"--success-message=lldb-installed."
)
.arg
(
"--image-dir"
)
.arg
(
&
image
)
.arg
(
"--work-dir"
)
.arg
(
&
tmpdir
(
builder
))
.arg
(
"--output-dir"
)
.arg
(
&
distdir
(
builder
))
.arg
(
"--non-installed-overlay"
)
.arg
(
&
overlay
)
.arg
(
format!
(
"--package-name={}-{}"
,
name
,
target
))
.arg
(
"--legacy-manifest-dirs=rustlib,cargo"
)
.arg
(
"--component-name=lldb-preview"
);
builder
.run
(
&
mut
cmd
);
Some
(
distdir
(
builder
)
.join
(
format!
(
"{}-{}.tar.gz"
,
name
,
target
)))
}
}
src/bootstrap/lib.rs
浏览文件 @
dc7524be
...
...
@@ -1029,14 +1029,6 @@ fn llvm_tools_vers(&self) -> String {
self
.rust_version
()
}
fn
lldb_package_vers
(
&
self
)
->
String
{
self
.package_vers
(
channel
::
CFG_RELEASE_NUM
)
}
fn
lldb_vers
(
&
self
)
->
String
{
self
.rust_version
()
}
fn
llvm_link_tools_dynamically
(
&
self
,
target
:
Interned
<
String
>
)
->
bool
{
target
.contains
(
"linux-gnu"
)
||
target
.contains
(
"apple-darwin"
)
}
...
...
src/bootstrap/native.rs
浏览文件 @
dc7524be
...
...
@@ -184,7 +184,7 @@ fn run(self, builder: &Builder<'_>) -> PathBuf {
}
// For distribution we want the LLVM tools to be *statically* linked to libstdc++
if
builder
.config.llvm_tools_enabled
||
builder
.config.lldb_enabled
{
if
builder
.config.llvm_tools_enabled
{
if
!
target
.contains
(
"msvc"
)
{
if
target
.contains
(
"apple"
)
{
cfg
.define
(
"CMAKE_EXE_LINKER_FLAGS"
,
"-static-libstdc++"
);
...
...
@@ -212,17 +212,9 @@ fn run(self, builder: &Builder<'_>) -> PathBuf {
enabled_llvm_projects
.push
(
"compiler-rt"
);
}
if
builder
.config.lldb_enabled
{
enabled_llvm_projects
.push
(
"clang"
);
enabled_llvm_projects
.push
(
"lldb"
);
// For the time being, disable code signing.
cfg
.define
(
"LLDB_CODESIGN_IDENTITY"
,
""
);
cfg
.define
(
"LLDB_NO_DEBUGSERVER"
,
"ON"
);
}
else
{
// LLDB requires libxml2; but otherwise we want it to be disabled.
// See https://github.com/rust-lang/rust/pull/50104
cfg
.define
(
"LLVM_ENABLE_LIBXML2"
,
"OFF"
);
}
// We want libxml to be disabled.
// See https://github.com/rust-lang/rust/pull/50104
cfg
.define
(
"LLVM_ENABLE_LIBXML2"
,
"OFF"
);
if
!
enabled_llvm_projects
.is_empty
()
{
enabled_llvm_projects
.sort
();
...
...
src/bootstrap/sanity.rs
浏览文件 @
dc7524be
...
...
@@ -117,14 +117,6 @@ pub fn check(build: &mut Build) {
build
.config.ninja
=
true
;
}
}
if
build
.config.lldb_enabled
{
cmd_finder
.must_have
(
"swig"
);
let
out
=
output
(
Command
::
new
(
"swig"
)
.arg
(
"-version"
));
if
!
out
.contains
(
"SWIG Version 3"
)
&&
!
out
.contains
(
"SWIG Version 4"
)
{
panic!
(
"Ensure that Swig 3.x.x or 4.x.x is installed."
);
}
}
}
build
.config.python
=
build
...
...
src/bootstrap/test.rs
浏览文件 @
dc7524be
...
...
@@ -1106,20 +1106,15 @@ fn run(self, builder: &Builder<'_>) {
.to_string
()
})
};
let
lldb_exe
=
if
builder
.config.lldb_enabled
{
// Test against the lldb that was just built.
builder
.llvm_out
(
target
)
.join
(
"bin"
)
.join
(
"lldb"
)
}
else
{
PathBuf
::
from
(
"lldb"
)
};
let
lldb_version
=
Command
::
new
(
&
lldb_exe
)
let
lldb_exe
=
"lldb"
;
let
lldb_version
=
Command
::
new
(
lldb_exe
)
.arg
(
"--version"
)
.output
()
.map
(|
output
|
String
::
from_utf8_lossy
(
&
output
.stdout
)
.to_string
())
.ok
();
if
let
Some
(
ref
vers
)
=
lldb_version
{
cmd
.arg
(
"--lldb-version"
)
.arg
(
vers
);
let
lldb_python_dir
=
run
(
Command
::
new
(
&
lldb_exe
)
.arg
(
"-P"
))
.ok
();
let
lldb_python_dir
=
run
(
Command
::
new
(
lldb_exe
)
.arg
(
"-P"
))
.ok
();
if
let
Some
(
ref
dir
)
=
lldb_python_dir
{
cmd
.arg
(
"--lldb-python-dir"
)
.arg
(
dir
);
}
...
...
src/tools/build-manifest/src/main.rs
浏览文件 @
dc7524be
...
...
@@ -228,7 +228,6 @@ struct Builder {
clippy_release
:
String
,
rustfmt_release
:
String
,
llvm_tools_release
:
String
,
lldb_release
:
String
,
miri_release
:
String
,
input
:
PathBuf
,
...
...
@@ -244,7 +243,6 @@ struct Builder {
clippy_version
:
Option
<
String
>
,
rustfmt_version
:
Option
<
String
>
,
llvm_tools_version
:
Option
<
String
>
,
lldb_version
:
Option
<
String
>
,
miri_version
:
Option
<
String
>
,
rust_git_commit_hash
:
Option
<
String
>
,
...
...
@@ -253,7 +251,6 @@ struct Builder {
clippy_git_commit_hash
:
Option
<
String
>
,
rustfmt_git_commit_hash
:
Option
<
String
>
,
llvm_tools_git_commit_hash
:
Option
<
String
>
,
lldb_git_commit_hash
:
Option
<
String
>
,
miri_git_commit_hash
:
Option
<
String
>
,
should_sign
:
bool
,
...
...
@@ -284,7 +281,6 @@ fn main() {
let
miri_release
=
args
.next
()
.unwrap
();
let
rustfmt_release
=
args
.next
()
.unwrap
();
let
llvm_tools_release
=
args
.next
()
.unwrap
();
let
lldb_release
=
args
.next
()
.unwrap
();
// Do not ask for a passphrase while manually testing
let
mut
passphrase
=
String
::
new
();
...
...
@@ -300,7 +296,6 @@ fn main() {
clippy_release
,
rustfmt_release
,
llvm_tools_release
,
lldb_release
,
miri_release
,
input
,
...
...
@@ -316,7 +311,6 @@ fn main() {
clippy_version
:
None
,
rustfmt_version
:
None
,
llvm_tools_version
:
None
,
lldb_version
:
None
,
miri_version
:
None
,
rust_git_commit_hash
:
None
,
...
...
@@ -325,7 +319,6 @@ fn main() {
clippy_git_commit_hash
:
None
,
rustfmt_git_commit_hash
:
None
,
llvm_tools_git_commit_hash
:
None
,
lldb_git_commit_hash
:
None
,
miri_git_commit_hash
:
None
,
should_sign
,
...
...
@@ -340,7 +333,6 @@ enum PkgType {
Clippy
,
Rustfmt
,
LlvmTools
,
Lldb
,
Miri
,
Other
,
}
...
...
@@ -355,7 +347,6 @@ fn from_component(component: &str) -> Self {
"clippy"
|
"clippy-preview"
=>
Clippy
,
"rustfmt"
|
"rustfmt-preview"
=>
Rustfmt
,
"llvm-tools"
|
"llvm-tools-preview"
=>
LlvmTools
,
"lldb"
|
"lldb-preview"
=>
Lldb
,
"miri"
|
"miri-preview"
=>
Miri
,
_
=>
Other
,
}
...
...
@@ -370,8 +361,6 @@ fn build(&mut self) {
self
.clippy_version
=
self
.version
(
"clippy"
,
"x86_64-unknown-linux-gnu"
);
self
.rustfmt_version
=
self
.version
(
"rustfmt"
,
"x86_64-unknown-linux-gnu"
);
self
.llvm_tools_version
=
self
.version
(
"llvm-tools"
,
"x86_64-unknown-linux-gnu"
);
// lldb is only built for macOS.
self
.lldb_version
=
self
.version
(
"lldb"
,
"x86_64-apple-darwin"
);
self
.miri_version
=
self
.version
(
"miri"
,
"x86_64-unknown-linux-gnu"
);
self
.rust_git_commit_hash
=
self
.git_commit_hash
(
"rust"
,
"x86_64-unknown-linux-gnu"
);
...
...
@@ -381,7 +370,6 @@ fn build(&mut self) {
self
.rustfmt_git_commit_hash
=
self
.git_commit_hash
(
"rustfmt"
,
"x86_64-unknown-linux-gnu"
);
self
.llvm_tools_git_commit_hash
=
self
.git_commit_hash
(
"llvm-tools"
,
"x86_64-unknown-linux-gnu"
);
self
.lldb_git_commit_hash
=
self
.git_commit_hash
(
"lldb"
,
"x86_64-unknown-linux-gnu"
);
self
.miri_git_commit_hash
=
self
.git_commit_hash
(
"miri"
,
"x86_64-unknown-linux-gnu"
);
self
.check_toolstate
();
...
...
@@ -456,7 +444,6 @@ fn add_packages_to(&mut self, manifest: &mut Manifest) {
package
(
"rustfmt-preview"
,
HOSTS
);
package
(
"rust-analysis"
,
TARGETS
);
package
(
"llvm-tools-preview"
,
TARGETS
);
package
(
"lldb-preview"
,
TARGETS
);
}
fn
add_profiles_to
(
&
mut
self
,
manifest
:
&
mut
Manifest
)
{
...
...
@@ -487,7 +474,6 @@ fn add_profiles_to(&mut self, manifest: &mut Manifest) {
"rls-preview"
,
"rust-src"
,
"llvm-tools-preview"
,
"lldb-preview"
,
"rust-analysis"
,
"miri-preview"
,
],
...
...
@@ -562,7 +548,6 @@ fn target_host_combination(&mut self, host: &str, manifest: &Manifest) -> Option
host_component
(
"rls-preview"
),
host_component
(
"rustfmt-preview"
),
host_component
(
"llvm-tools-preview"
),
host_component
(
"lldb-preview"
),
host_component
(
"rust-analysis"
),
]);
...
...
@@ -692,7 +677,6 @@ fn filename(&self, component: &str, target: &str) -> String {
Clippy
=>
format!
(
"clippy-{}-{}.tar.gz"
,
self
.clippy_release
,
target
),
Rustfmt
=>
format!
(
"rustfmt-{}-{}.tar.gz"
,
self
.rustfmt_release
,
target
),
LlvmTools
=>
format!
(
"llvm-tools-{}-{}.tar.gz"
,
self
.llvm_tools_release
,
target
),
Lldb
=>
format!
(
"lldb-{}-{}.tar.gz"
,
self
.lldb_release
,
target
),
Miri
=>
format!
(
"miri-{}-{}.tar.gz"
,
self
.miri_release
,
target
),
Other
=>
format!
(
"{}-{}-{}.tar.gz"
,
component
,
self
.rust_release
,
target
),
}
...
...
@@ -706,7 +690,6 @@ fn cached_version(&self, component: &str) -> &Option<String> {
Clippy
=>
&
self
.clippy_version
,
Rustfmt
=>
&
self
.rustfmt_version
,
LlvmTools
=>
&
self
.llvm_tools_version
,
Lldb
=>
&
self
.lldb_version
,
Miri
=>
&
self
.miri_version
,
_
=>
&
self
.rust_version
,
}
...
...
@@ -720,7 +703,6 @@ fn cached_git_commit_hash(&self, component: &str) -> &Option<String> {
Clippy
=>
&
self
.clippy_git_commit_hash
,
Rustfmt
=>
&
self
.rustfmt_git_commit_hash
,
LlvmTools
=>
&
self
.llvm_tools_git_commit_hash
,
Lldb
=>
&
self
.lldb_git_commit_hash
,
Miri
=>
&
self
.miri_git_commit_hash
,
_
=>
&
self
.rust_git_commit_hash
,
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录