Fix bug: building on MACOSX
Merge pull request #5642 from kaienfr/new_build_MACOSX

Fix bug: building on MACOSX
Merge commit 'ae090662929a9efcd59f5b46b06dcd45c78062f7' into branch_iOS