Don't silently fail if we can't build deps.mk.
merge bug25537 into stable