about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-07-14 02:56:55 +0800
committerGitHub <noreply@github.com>2018-07-14 02:56:55 +0800
commitfe64419102fa641bd042cbafbd7fd7868dde14d4 (patch)
tree0d9c99a87210c38521115e33869a47a5f65f7712 /src/test
parent383d50f6670eaf186ac541f4eff1b6ed1b5ff25f (diff)
parent488472d754a70d6b1c98e4d901dff438257ab06d (diff)
downloadrust-fe64419102fa641bd042cbafbd7fd7868dde14d4.tar.gz
rust-fe64419102fa641bd042cbafbd7fd7868dde14d4.zip
Rollup merge of #52330 - jethrogb:jb/target-link-args, r=varkor
Don't silently ignore invalid data in target spec

This is technically a breaking change, but only because invalid data was previously silently being ignored.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json b/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
index 3ae01d72fcc..48040ae3da0 100644
--- a/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
+++ b/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
@@ -1,5 +1,5 @@
 {
-    "pre-link-args": ["-m64"],
+    "pre-link-args": {"gcc": ["-m64"]},
     "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
     "linker-flavor": "gcc",
     "llvm-target": "x86_64-unknown-linux-gnu",