@@ -1017,10 +1017,25 @@ class BuildTool
10171017 defaultObjCxxStandard = 11 ;
10181018 }
10191019
1020- group .mCStandard = inXML .has .c_standard ? Std .parseInt (substitute (inXML .att .c_standard )) : defaultCStandard ;
1021- group .mObjCStandard = inXML .has .objc_standard ? Std .parseInt (substitute (inXML .att .objc_standard )) : defaultObjCStandard != null ? defaultObjCStandard : group .mCStandard ;
1022- group .mCxxStandard = inXML .has .cxx_standard ? Std .parseInt (substitute (inXML .att .cxx_standard )) : defaultCxxStandard ;
1023- group .mObjCxxStandard = inXML .has .objcxx_standard ? Std .parseInt (substitute (inXML .att .objcxx_standard )) : defaultObjCxxStandard != null ? defaultObjCxxStandard : group .mCxxStandard ;
1020+ if (inXML .has .c_standard )
1021+ group .mCStandard = Std .parseInt (substitute (inXML .att .c_standard ));
1022+ else if (group .mCStandard == null )
1023+ group .mCStandard = defaultCStandard ;
1024+
1025+ if (inXML .has .objc_standard )
1026+ group .mObjCStandard = Std .parseInt (substitute (inXML .att .objc_standard ));
1027+ else if (group .mObjCStandard == null )
1028+ group .mObjCStandard = defaultObjCStandard != null ? defaultObjCStandard : group .mCStandard ;
1029+
1030+ if (inXML .has .cxx_standard )
1031+ group .mCxxStandard = Std .parseInt (substitute (inXML .att .cxx_standard ));
1032+ else if (group .mCxxStandard == null )
1033+ group .mCxxStandard = defaultCxxStandard ;
1034+
1035+ if (inXML .has .objcxx_standard )
1036+ group .mObjCxxStandard = Std .parseInt (substitute (inXML .att .objcxx_standard ));
1037+ else if (group .mObjCxxStandard == null )
1038+ group .mObjCxxStandard = defaultObjCxxStandard != null ? defaultObjCxxStandard : group .mCxxStandard ;
10241039
10251040 for (el in inXML .elements )
10261041 {
0 commit comments