@@ -676,6 +676,7 @@ pub(crate) struct TomlConfig {
676
676
build : Option < Build > ,
677
677
install : Option < Install > ,
678
678
llvm : Option < Llvm > ,
679
+ gcc : Option < Gcc > ,
679
680
rust : Option < Rust > ,
680
681
target : Option < HashMap < String , TomlTarget > > ,
681
682
dist : Option < Dist > ,
@@ -710,7 +711,7 @@ trait Merge {
710
711
impl Merge for TomlConfig {
711
712
fn merge (
712
713
& 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 ,
714
715
replace : ReplaceOpt ,
715
716
) {
716
717
fn do_merge < T : Merge > ( x : & mut Option < T > , y : Option < T > , replace : ReplaceOpt ) {
@@ -729,6 +730,7 @@ impl Merge for TomlConfig {
729
730
do_merge ( & mut self . build , build, replace) ;
730
731
do_merge ( & mut self . install , install, replace) ;
731
732
do_merge ( & mut self . llvm , llvm, replace) ;
733
+ do_merge ( & mut self . gcc , gcc, replace) ;
732
734
do_merge ( & mut self . rust , rust, replace) ;
733
735
do_merge ( & mut self . dist , dist, replace) ;
734
736
@@ -995,6 +997,11 @@ define_config! {
995
997
}
996
998
}
997
999
1000
+ define_config ! {
1001
+ /// TOML representation of how the GCC build is configured.
1002
+ struct Gcc { }
1003
+ }
1004
+
998
1005
define_config ! {
999
1006
struct Dist {
1000
1007
sign_folder: Option <String > = "sign-folder" ,
0 commit comments