Skip to content

Commit

Permalink
mk: Fix Windows cross-build prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
@klutzy
klutzy committed Nov 8, 2014
1 parent b80edf1 commit 1df6be1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion mk/cfg/i686-pc-windows-gnu
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion mk/cfg/x86_64-pc-windows-gnu
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down

5 comments on commit 1df6be1

@bors
Copy link
Contributor

@bors bors commented on 1df6be1 Nov 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from cmr
at klutzy@1df6be1

@bors
Copy link
Contributor

@bors bors commented on 1df6be1 Nov 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging klutzy/rust/cross = 1df6be1 into auto

@bors
Copy link
Contributor

@bors bors commented on 1df6be1 Nov 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

klutzy/rust/cross = 1df6be1 merged ok, testing candidate = e575cff

@bors
Copy link
Contributor

@bors bors commented on 1df6be1 Nov 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2194
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2193
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2186
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2193
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2187
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2186
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2186
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2190
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2183
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2182
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2186
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1845
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1842
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1849
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/686
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/679
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/673

@bors
Copy link
Contributor

@bors bors commented on 1df6be1 Nov 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = e575cff

Please sign in to comment.