Skip to content

Commit 0710040

Browse files
Make sure to include default en-US ftl resources for rustc_error crate
1 parent 04075b3 commit 0710040

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

compiler/rustc_driver_impl/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ pub static DEFAULT_LOCALE_RESOURCES: &[&str] = &[
9797
rustc_codegen_ssa::DEFAULT_LOCALE_RESOURCE,
9898
rustc_const_eval::DEFAULT_LOCALE_RESOURCE,
9999
rustc_error_messages::DEFAULT_LOCALE_RESOURCE,
100+
rustc_errors::DEFAULT_LOCALE_RESOURCE,
100101
rustc_expand::DEFAULT_LOCALE_RESOURCE,
101102
rustc_hir_analysis::DEFAULT_LOCALE_RESOURCE,
102103
rustc_hir_typeck::DEFAULT_LOCALE_RESOURCE,

tests/run-make/target-specs/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ all:
88
RUST_TARGET_PATH=. $(RUSTC) foo.rs --target=my-x86_64-unknown-linux-gnu-platform --crate-type=lib --emit=asm
99
$(RUSTC) -Z unstable-options --target=my-awesome-platform.json --print target-spec-json > $(TMPDIR)/test-platform.json && $(RUSTC) -Z unstable-options --target=$(TMPDIR)/test-platform.json --print target-spec-json | diff -q $(TMPDIR)/test-platform.json -
1010
$(RUSTC) foo.rs --target=definitely-not-builtin-target 2>&1 | $(CGREP) 'may not set is_builtin'
11+
$(RUSTC) foo.rs --target=endianness-mismatch 2>&1 | $(CGREP) '"data-layout" claims architecture is little-endian'
1112
$(RUSTC) foo.rs --target=mismatching-data-layout --crate-type=lib
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"pre-link-args": {"gcc": ["-m64"]},
3+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
4+
"linker-flavor": "gcc",
5+
"llvm-target": "x86_64-unknown-linux-gnu",
6+
"target-endian": "big",
7+
"target-pointer-width": "64",
8+
"target-c-int-width": "32",
9+
"arch": "x86_64",
10+
"os": "linux"
11+
}

0 commit comments

Comments
 (0)