Skip to content

Commit

Permalink
etc: Don't bundle libctl3d32 on windows
Browse files Browse the repository at this point in the history 
Apparently it's not found on win64!

Closes #18928
  • Loading branch information
@alexcrichton
alexcrichton committed Nov 13, 2014
1 parent 37ea270 commit b73bc79
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/etc/make-win-dist.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def make_win_dist(dist_root, target_triple):
"libcomctl32.a",
"libcomdlg32.a",
"libcrypt32.a",
"libctl3d32.a",
"libgdi32.a",
"libimagehlp.a",
"libiphlpapi.a",
Expand Down

10 comments on commit b73bc79

@bors
Copy link
Contributor

@bors bors commented on b73bc79 Nov 13, 2014

Choose a reason for hiding this comment

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

saw approval from brson
at alexcrichton@b73bc79

@bors
Copy link
Contributor

@bors bors commented on b73bc79 Nov 13, 2014

Choose a reason for hiding this comment

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

merging alexcrichton/rust/issue-18928 = b73bc79 into auto

@bors
Copy link
Contributor

@bors bors commented on b73bc79 Nov 13, 2014

Choose a reason for hiding this comment

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

alexcrichton/rust/issue-18928 = b73bc79 merged ok, testing candidate = 68476e3f

@bors
Copy link
Contributor

@bors bors commented on b73bc79 Nov 13, 2014

Choose a reason for hiding this comment

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

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2247
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1898

@alexcrichton
Copy link
Member Author

Choose a reason for hiding this comment

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

cc @michaelwoerister, lldb timeout :(

@bors
Copy link
Contributor

@bors bors commented on b73bc79 Nov 14, 2014

Choose a reason for hiding this comment

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

saw approval from brson
at alexcrichton@b73bc79

@bors
Copy link
Contributor

@bors bors commented on b73bc79 Nov 14, 2014

Choose a reason for hiding this comment

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

merging alexcrichton/rust/issue-18928 = b73bc79 into auto

@bors
Copy link
Contributor

@bors bors commented on b73bc79 Nov 14, 2014

Choose a reason for hiding this comment

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

alexcrichton/rust/issue-18928 = b73bc79 merged ok, testing candidate = a58fc68

@bors
Copy link
Contributor

@bors bors commented on b73bc79 Nov 14, 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/2249
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2247
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2240
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2247
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2241
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2240
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2240
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2244
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2237
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2236
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2240
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1900
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1896
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1903
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/740
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/734
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/728

@bors
Copy link
Contributor

@bors bors commented on b73bc79 Nov 14, 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 = a58fc68

Please sign in to comment.