make more pkgs support darwin Upstream-commit: 3011a41d3f3b525574407493696ea2391ecc0ff6 Component: engine