Merge pull request #803 from ikesyo/fix-osx-nshost-build