Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a8af2bc

Browse files
committedDec 6, 2019
Auto merge of #67077 - Aaron1011:build-llvm-in-binary, r=<try>
rustc: Link LLVM directly into rustc again (take two) This is a continuation of PR #65703
2 parents 7b482cd + 408e3cf commit a8af2bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+186
-463
lines changed
 

‎Cargo.lock

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3496,7 +3496,27 @@ dependencies = [
34963496
name = "rustc_codegen_llvm"
34973497
version = "0.0.0"
34983498
dependencies = [
3499+
"bitflags",
3500+
"flate2",
3501+
"libc",
3502+
"log",
3503+
"rustc",
3504+
"rustc-demangle",
3505+
"rustc_codegen_ssa",
3506+
"rustc_codegen_utils",
3507+
"rustc_data_structures",
3508+
"rustc_errors",
3509+
"rustc_feature",
3510+
"rustc_fs_util",
3511+
"rustc_incremental",
3512+
"rustc_index",
34993513
"rustc_llvm",
3514+
"rustc_session",
3515+
"rustc_target",
3516+
"smallvec 0.6.10",
3517+
"syntax",
3518+
"syntax_expand",
3519+
"syntax_pos",
35003520
]
35013521

35023522
[[package]]
@@ -3658,6 +3678,7 @@ dependencies = [
36583678
"once_cell",
36593679
"rustc",
36603680
"rustc-rayon 0.3.0",
3681+
"rustc_codegen_llvm",
36613682
"rustc_codegen_ssa",
36623683
"rustc_codegen_utils",
36633684
"rustc_data_structures",

‎config.toml.example

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,6 @@
379379
# and currently the only standard option supported is `"llvm"`
380380
#codegen-backends = ["llvm"]
381381

382-
# This is the name of the directory in which codegen backends will get installed
383-
#codegen-backends-dir = "codegen-backends"
384-
385382
# Indicates whether LLD will be compiled and made available in the sysroot for
386383
# rustc to execute.
387384
#lld = false

0 commit comments

Comments
 (0)
Please sign in to comment.