Log Message: Actually commit what I thought I had yesterday with further fix to do buildlink fixup in platform independent way.