@@ -308,6 +308,7 @@ pub struct Config {
308308 pub dist_compression_formats : Option < Vec < String > > ,
309309 pub dist_compression_profile : String ,
310310 pub dist_include_mingw_linker : bool ,
311+ pub dist_vendor : bool ,
311312
312313 // libstd features
313314 pub backtrace : bool , // support for RUST_BACKTRACE
@@ -933,6 +934,7 @@ define_config! {
933934 compression_formats: Option <Vec <String >> = "compression-formats" ,
934935 compression_profile: Option <String > = "compression-profile" ,
935936 include_mingw_linker: Option <bool > = "include-mingw-linker" ,
937+ vendor: Option <bool > = "vendor" ,
936938 }
937939}
938940
@@ -2028,13 +2030,19 @@ impl Config {
20282030 compression_formats,
20292031 compression_profile,
20302032 include_mingw_linker,
2033+ vendor,
20312034 } = dist;
20322035 config. dist_sign_folder = sign_folder. map ( PathBuf :: from) ;
20332036 config. dist_upload_addr = upload_addr;
20342037 config. dist_compression_formats = compression_formats;
20352038 set ( & mut config. dist_compression_profile , compression_profile) ;
20362039 set ( & mut config. rust_dist_src , src_tarball) ;
2037- set ( & mut config. dist_include_mingw_linker , include_mingw_linker)
2040+ set ( & mut config. dist_include_mingw_linker , include_mingw_linker) ;
2041+ config. dist_vendor = vendor. unwrap_or_else ( || {
2042+ // If we're building from git or tarball sources, enable it by default.
2043+ config. rust_info . is_managed_git_subrepository ( )
2044+ || config. rust_info . is_from_tarball ( )
2045+ } ) ;
20382046 }
20392047
20402048 if let Some ( r) = rustfmt {
0 commit comments