rustc: fixed build after 7068828389390dca066fb1062bd27148d49339d4

That commit changed the patch to work for the new HEAD, but that new
patch breaks 0.11. I made two patch for the two versions.
Merge pull request #4115 from madjar/master

rustc: fixed build after 7068828389390dca066fb1062bd27148d49339d4