This reverts commit e97f8fecfa. No longer necessary since the rustc wrapper now handles --sysroot correctly.
e97f8fecfa