Back out some cross-compile related makefile cruft which should have
been fixed properly in mainline.