@@ -676,6 +676,7 @@ pub(crate) struct TomlConfig {
676676 build : Option < Build > ,
677677 install : Option < Install > ,
678678 llvm : Option < Llvm > ,
679+ gcc : Option < Gcc > ,
679680 rust : Option < Rust > ,
680681 target : Option < HashMap < String , TomlTarget > > ,
681682 dist : Option < Dist > ,
@@ -710,7 +711,7 @@ trait Merge {
710711impl Merge for TomlConfig {
711712 fn merge (
712713 & mut self ,
713- TomlConfig { build, install, llvm, rust, dist, target, profile, change_id } : Self ,
714+ TomlConfig { build, install, llvm, gcc , rust, dist, target, profile, change_id } : Self ,
714715 replace : ReplaceOpt ,
715716 ) {
716717 fn do_merge < T : Merge > ( x : & mut Option < T > , y : Option < T > , replace : ReplaceOpt ) {
@@ -729,6 +730,7 @@ impl Merge for TomlConfig {
729730 do_merge ( & mut self . build , build, replace) ;
730731 do_merge ( & mut self . install , install, replace) ;
731732 do_merge ( & mut self . llvm , llvm, replace) ;
733+ do_merge ( & mut self . gcc , gcc, replace) ;
732734 do_merge ( & mut self . rust , rust, replace) ;
733735 do_merge ( & mut self . dist , dist, replace) ;
734736
@@ -995,6 +997,11 @@ define_config! {
995997 }
996998}
997999
1000+ define_config ! {
1001+ /// TOML representation of how the GCC build is configured.
1002+ struct Gcc { }
1003+ }
1004+
9981005define_config ! {
9991006 struct Dist {
10001007 sign_folder: Option <String > = "sign-folder" ,
0 commit comments