On Sat, Jul 21, 2012 at 05:59:15PM +1000, Zack Corr wrote: > As mentioned on issue #2641 <https://github.com/mozilla/rust/issues/2641> by > jld: > >> April 18th: 3.1 is branched. (llvm-mirror/clang@103f41d) >> April 26th: Rust grabs trunk. (llvm-mirror/clang@9b94cd1) >> April 30th: bug is fixed on trunk. (llvm-mirror/clang@b86b855) >> May 8th: fix is crossported to 3.1. (llvm-mirror/clang@82520fb) > > Rust's LLVM was merged with 3.1 before the fix for issue #2641 was merged > into 3.1 for the official release.
It's a little weirder than that, because Rust apparently grabbed LLVM and Clang from their respective trunks, rather than release_31, after the branch point. So there are a bunch of commits[*] that would be dropped if it switched to the 3.1 final version, but I don't know if those matter. The simple, low-impact alternative is to just pull up that one commit, thusly: https://github.com/jld/clang/tree/rust-2641 https://github.com/jld/llvm/tree/rust-2641 https://github.com/jld/rust/tree/rust-2641 > Merging might also fix something that was breaking my experimentations with > JIT which seemed to work with Arch Linux's LLVM 3.1 package. ...but that wouldn't fix anyone else's problems. --Jed [*] `git rev-list origin/release_31..9b94cd1 | wc -l` => 150 `git log origin/master..origin/release_31 | grep -c '^ *Merging r[0-9]*:$'` => 23 _______________________________________________ Rust-dev mailing list [email protected] https://mail.mozilla.org/listinfo/rust-dev
