The /build/gnat gpr's have got a bit confused by the looks of things. Can you try this patch, it's made from a stash from a diff branch, if it works I'll apply it and push it. Luke.