Build: Fixing static lib build