Hoping this is the last patch to get cross compiling to work.