Merge pull request #1652 from debuglevel/bugfix-crosscompile