r24745: Merge Simo's shared lib build fix from svn r22842 that was lost