about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-11-10 04:41:49 +0000
committerbors <bors@rust-lang.org>2014-11-10 04:41:49 +0000
commite575cff77d9ce8d8d200691ea7f7c9dedc56e977 (patch)
tree1d95088c717a695cfbc2f7fcb4fdc2139718ac91
parent809cd0c89e96d94a36378a0515722c432e02e0e7 (diff)
parent1df6be1926c4e14f969208039beafcf773c44eb3 (diff)
downloadrust-e575cff77d9ce8d8d200691ea7f7c9dedc56e977.tar.gz
rust-e575cff77d9ce8d8d200691ea7f7c9dedc56e977.zip
auto merge of #18781 : klutzy/rust/cross, r=cmr
cc #12859
-rw-r--r--mk/cfg/i686-pc-windows-gnu2
-rw-r--r--mk/cfg/x86_64-pc-windows-gnu2
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/cfg/i686-pc-windows-gnu b/mk/cfg/i686-pc-windows-gnu
index f24d8312f3c..52ed733e443 100644
--- a/mk/cfg/i686-pc-windows-gnu
+++ b/mk/cfg/i686-pc-windows-gnu
@@ -1,5 +1,5 @@
 # i686-pc-windows-gnu configuration
-CROSS_PREFIX_i686-pc-windows-gnu=i686-pc-windows-gnu-
+CROSS_PREFIX_i686-pc-windows-gnu=i686-w64-mingw32-
 CC_i686-pc-windows-gnu=gcc
 CXX_i686-pc-windows-gnu=g++
 CPP_i686-pc-windows-gnu=gcc -E
diff --git a/mk/cfg/x86_64-pc-windows-gnu b/mk/cfg/x86_64-pc-windows-gnu
index fbe2e832f40..14ebdf5c390 100644
--- a/mk/cfg/x86_64-pc-windows-gnu
+++ b/mk/cfg/x86_64-pc-windows-gnu
@@ -1,5 +1,5 @@
 # x86_64-pc-windows-gnu configuration
-CROSS_PREFIX_x86_64-pc-windows-gnu=x86_64-pc-windows-gnu-
+CROSS_PREFIX_x86_64-pc-windows-gnu=x86_64-w64-mingw32-
 CC_x86_64-pc-windows-gnu=gcc
 CXX_x86_64-pc-windows-gnu=g++
 CPP_x86_64-pc-windows-gnu=gcc -E