[OS-BUILD PATCHv5 6/18] spec: Fix separate tools build