Rollup merge of #56048 - bjorn3:cg_ssa_sysroot, r=eddyb
Add rustc_codegen_ssa to sysroot Outside of rustc you are currently unable to use it. r? @nikomatsakis (because you r+'ed #55627)
This commit is contained in:
commit
1b707f78f5
19
Cargo.lock
19
Cargo.lock
|
@ -2073,6 +2073,7 @@ dependencies = [
|
||||||
name = "rustc-main"
|
name = "rustc-main"
|
||||||
version = "0.0.0"
|
version = "0.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"rustc_codegen_ssa 0.0.0",
|
||||||
"rustc_driver 0.0.0",
|
"rustc_driver 0.0.0",
|
||||||
"rustc_target 0.0.0",
|
"rustc_target 0.0.0",
|
||||||
]
|
]
|
||||||
|
@ -2169,7 +2170,6 @@ dependencies = [
|
||||||
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
"rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"rustc_codegen_ssa 0.0.0",
|
|
||||||
"rustc_llvm 0.0.0",
|
"rustc_llvm 0.0.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -2177,10 +2177,27 @@ dependencies = [
|
||||||
name = "rustc_codegen_ssa"
|
name = "rustc_codegen_ssa"
|
||||||
version = "0.0.0"
|
version = "0.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
|
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"jobserver 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rustc 0.0.0",
|
||||||
"rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
"rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rustc_allocator 0.0.0",
|
||||||
|
"rustc_apfloat 0.0.0",
|
||||||
|
"rustc_codegen_utils 0.0.0",
|
||||||
|
"rustc_data_structures 0.0.0",
|
||||||
|
"rustc_errors 0.0.0",
|
||||||
|
"rustc_fs_util 0.0.0",
|
||||||
|
"rustc_incremental 0.0.0",
|
||||||
|
"rustc_mir 0.0.0",
|
||||||
|
"rustc_target 0.0.0",
|
||||||
|
"serialize 0.0.0",
|
||||||
|
"syntax 0.0.0",
|
||||||
|
"syntax_pos 0.0.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
|
@ -13,7 +13,6 @@ test = false
|
||||||
cc = "1.0.1"
|
cc = "1.0.1"
|
||||||
num_cpus = "1.0"
|
num_cpus = "1.0"
|
||||||
rustc-demangle = "0.1.4"
|
rustc-demangle = "0.1.4"
|
||||||
rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
|
|
||||||
rustc_llvm = { path = "../librustc_llvm" }
|
rustc_llvm = { path = "../librustc_llvm" }
|
||||||
memmap = "0.6"
|
memmap = "0.6"
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,29 @@ version = "0.0.0"
|
||||||
[lib]
|
[lib]
|
||||||
name = "rustc_codegen_ssa"
|
name = "rustc_codegen_ssa"
|
||||||
path = "lib.rs"
|
path = "lib.rs"
|
||||||
|
crate-type = ["dylib"]
|
||||||
test = false
|
test = false
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
bitflags = "1.0.4"
|
||||||
cc = "1.0.1"
|
cc = "1.0.1"
|
||||||
num_cpus = "1.0"
|
num_cpus = "1.0"
|
||||||
rustc-demangle = "0.1.4"
|
rustc-demangle = "0.1.4"
|
||||||
memmap = "0.6"
|
memmap = "0.6"
|
||||||
|
log = "0.4.5"
|
||||||
|
libc = "0.2.43"
|
||||||
|
jobserver = "0.1.11"
|
||||||
|
|
||||||
|
serialize = { path = "../libserialize" }
|
||||||
|
syntax = { path = "../libsyntax" }
|
||||||
|
syntax_pos = { path = "../libsyntax_pos" }
|
||||||
|
rustc = { path = "../librustc" }
|
||||||
|
rustc_allocator = { path = "../librustc_allocator" }
|
||||||
|
rustc_apfloat = { path = "../librustc_apfloat" }
|
||||||
|
rustc_codegen_utils = { path = "../librustc_codegen_utils" }
|
||||||
|
rustc_data_structures = { path = "../librustc_data_structures"}
|
||||||
|
rustc_errors = { path = "../librustc_errors" }
|
||||||
|
rustc_fs_util = { path = "../librustc_fs_util" }
|
||||||
|
rustc_incremental = { path = "../librustc_incremental" }
|
||||||
|
rustc_mir = { path = "../librustc_mir" }
|
||||||
|
rustc_target = { path = "../librustc_target" }
|
||||||
|
|
|
@ -11,5 +11,9 @@ path = "rustc.rs"
|
||||||
rustc_target = { path = "../librustc_target" }
|
rustc_target = { path = "../librustc_target" }
|
||||||
rustc_driver = { path = "../librustc_driver" }
|
rustc_driver = { path = "../librustc_driver" }
|
||||||
|
|
||||||
|
# Make sure rustc_codegen_ssa ends up in the sysroot, because this
|
||||||
|
# crate is intended to be used by codegen backends, which may not be in-tree.
|
||||||
|
rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
jemalloc = ['rustc_driver/jemalloc-sys']
|
jemalloc = ['rustc_driver/jemalloc-sys']
|
||||||
|
|
Loading…
Reference in New Issue