diff options
| author | Philipp Oppermann <dev@phil-opp.com> | 2017-10-10 10:05:29 +0200 |
|---|---|---|
| committer | Philipp Oppermann <dev@phil-opp.com> | 2017-10-10 10:05:29 +0200 |
| commit | 06b9168d3362dc60a2e87d475319686332634319 (patch) | |
| tree | b65516eff0bae3e5d99b04dd56de0f0e12ae4f7d /src/test | |
| parent | e8ba32e7a07dbcba124cceeee8c75535309084aa (diff) | |
| download | rust-06b9168d3362dc60a2e87d475319686332634319.tar.gz rust-06b9168d3362dc60a2e87d475319686332634319.zip | |
Rename test Linux target to avoid conflict with built-in target
It seems like the file wasn't actually used, since there is a built-in target with the same name. See https://github.com/rust-lang/rust/pull/45108#issuecomment-335173165 for more details.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make/target-specs/Makefile | 2 | ||||
| -rw-r--r-- | src/test/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json (renamed from src/test/run-make/target-specs/x86_64-unknown-linux-gnu.json) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/test/run-make/target-specs/Makefile b/src/test/run-make/target-specs/Makefile index 6b58ad7b6df..5ea96daa3ef 100644 --- a/src/test/run-make/target-specs/Makefile +++ b/src/test/run-make/target-specs/Makefile @@ -5,5 +5,5 @@ all: $(RUSTC) foo.rs --target=my-invalid-platform.json 2>&1 | grep -q "Error loading target specification" $(RUSTC) foo.rs --target=my-incomplete-platform.json 2>&1 | grep 'Field llvm-target' RUST_TARGET_PATH=. $(RUSTC) foo.rs --target=my-awesome-platform --crate-type=lib --emit=asm - RUST_TARGET_PATH=. $(RUSTC) foo.rs --target=x86_64-unknown-linux-gnu --crate-type=lib --emit=asm + RUST_TARGET_PATH=. $(RUSTC) foo.rs --target=my-x86_64-unknown-linux-gnu-platform --crate-type=lib --emit=asm $(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 - diff --git a/src/test/run-make/target-specs/x86_64-unknown-linux-gnu.json b/src/test/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json index 3ae01d72fcc..3ae01d72fcc 100644 --- a/src/test/run-make/target-specs/x86_64-unknown-linux-gnu.json +++ b/src/test/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json |