change labels for i386/mach-o/darwi
Revert "change labels for i386/mach-o/darwi"

This reverts commit c338020df9cf480e4012e588dffbe6f1e662c145.
Merge branch 'develop'
Update Jamfile.v2
Merge branch 'develop'