Unify CMAKE_OSX_SYSROOT
Merge branch 'update' into update.macosx