@@ -670,6 +670,7 @@ pub(crate) struct TomlConfig {
670
670
build : Option < Build > ,
671
671
install : Option < Install > ,
672
672
llvm : Option < Llvm > ,
673
+ gcc : Option < Gcc > ,
673
674
rust : Option < Rust > ,
674
675
target : Option < HashMap < String , TomlTarget > > ,
675
676
dist : Option < Dist > ,
@@ -704,7 +705,7 @@ trait Merge {
704
705
impl Merge for TomlConfig {
705
706
fn merge (
706
707
& mut self ,
707
- TomlConfig { build, install, llvm, rust, dist, target, profile, change_id } : Self ,
708
+ TomlConfig { build, install, llvm, gcc , rust, dist, target, profile, change_id } : Self ,
708
709
replace : ReplaceOpt ,
709
710
) {
710
711
fn do_merge < T : Merge > ( x : & mut Option < T > , y : Option < T > , replace : ReplaceOpt ) {
@@ -723,6 +724,7 @@ impl Merge for TomlConfig {
723
724
do_merge ( & mut self . build , build, replace) ;
724
725
do_merge ( & mut self . install , install, replace) ;
725
726
do_merge ( & mut self . llvm , llvm, replace) ;
727
+ do_merge ( & mut self . gcc , gcc, replace) ;
726
728
do_merge ( & mut self . rust , rust, replace) ;
727
729
do_merge ( & mut self . dist , dist, replace) ;
728
730
@@ -988,6 +990,11 @@ define_config! {
988
990
}
989
991
}
990
992
993
+ define_config ! {
994
+ /// TOML representation of how the GCC build is configured.
995
+ struct Gcc { }
996
+ }
997
+
991
998
define_config ! {
992
999
struct Dist {
993
1000
sign_folder: Option <String > = "sign-folder" ,
0 commit comments