Skip to content

Commit 1b707f7

Browse files
authored
Rollup merge of rust-lang#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 rust-lang#55627)
2 parents 419a101 + 60e4158 commit 1b707f7

File tree

4 files changed

+41
-2
lines changed

4 files changed

+41
-2
lines changed

Cargo.lock

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2073,6 +2073,7 @@ dependencies = [
20732073
name = "rustc-main"
20742074
version = "0.0.0"
20752075
dependencies = [
2076+
"rustc_codegen_ssa 0.0.0",
20762077
"rustc_driver 0.0.0",
20772078
"rustc_target 0.0.0",
20782079
]
@@ -2169,18 +2170,34 @@ dependencies = [
21692170
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
21702171
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
21712172
"rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
2172-
"rustc_codegen_ssa 0.0.0",
21732173
"rustc_llvm 0.0.0",
21742174
]
21752175

21762176
[[package]]
21772177
name = "rustc_codegen_ssa"
21782178
version = "0.0.0"
21792179
dependencies = [
2180+
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
21802181
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
2182+
"jobserver 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
2183+
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
2184+
"log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
21812185
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
21822186
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
2187+
"rustc 0.0.0",
21832188
"rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
2189+
"rustc_allocator 0.0.0",
2190+
"rustc_apfloat 0.0.0",
2191+
"rustc_codegen_utils 0.0.0",
2192+
"rustc_data_structures 0.0.0",
2193+
"rustc_errors 0.0.0",
2194+
"rustc_fs_util 0.0.0",
2195+
"rustc_incremental 0.0.0",
2196+
"rustc_mir 0.0.0",
2197+
"rustc_target 0.0.0",
2198+
"serialize 0.0.0",
2199+
"syntax 0.0.0",
2200+
"syntax_pos 0.0.0",
21842201
]
21852202

21862203
[[package]]

src/librustc_codegen_llvm/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ test = false
1313
cc = "1.0.1"
1414
num_cpus = "1.0"
1515
rustc-demangle = "0.1.4"
16-
rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
1716
rustc_llvm = { path = "../librustc_llvm" }
1817
memmap = "0.6"
1918

src/librustc_codegen_ssa/Cargo.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,29 @@ version = "0.0.0"
66
[lib]
77
name = "rustc_codegen_ssa"
88
path = "lib.rs"
9+
crate-type = ["dylib"]
910
test = false
1011

1112
[dependencies]
13+
bitflags = "1.0.4"
1214
cc = "1.0.1"
1315
num_cpus = "1.0"
1416
rustc-demangle = "0.1.4"
1517
memmap = "0.6"
18+
log = "0.4.5"
19+
libc = "0.2.43"
20+
jobserver = "0.1.11"
21+
22+
serialize = { path = "../libserialize" }
23+
syntax = { path = "../libsyntax" }
24+
syntax_pos = { path = "../libsyntax_pos" }
25+
rustc = { path = "../librustc" }
26+
rustc_allocator = { path = "../librustc_allocator" }
27+
rustc_apfloat = { path = "../librustc_apfloat" }
28+
rustc_codegen_utils = { path = "../librustc_codegen_utils" }
29+
rustc_data_structures = { path = "../librustc_data_structures"}
30+
rustc_errors = { path = "../librustc_errors" }
31+
rustc_fs_util = { path = "../librustc_fs_util" }
32+
rustc_incremental = { path = "../librustc_incremental" }
33+
rustc_mir = { path = "../librustc_mir" }
34+
rustc_target = { path = "../librustc_target" }

src/rustc/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,9 @@ path = "rustc.rs"
1111
rustc_target = { path = "../librustc_target" }
1212
rustc_driver = { path = "../librustc_driver" }
1313

14+
# Make sure rustc_codegen_ssa ends up in the sysroot, because this
15+
# crate is intended to be used by codegen backends, which may not be in-tree.
16+
rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
17+
1418
[features]
1519
jemalloc = ['rustc_driver/jemalloc-sys']

0 commit comments

Comments
 (0)