decouple dependency bundling from bootstrapping
    
    We probably should stop (ab)using the bootstrap macro for module builds
    with bundled dependencies. This patch decouples one from the other;
    use --with=bundled for just bundling
    and --with=bootstrap for full bootstrapping.