Revert r333496.
I didn't put the correct paths, nor lib32, and I may have been comparing against the wrong source tree.