@@ -1245,19 +1245,22 @@ def ProcessConditionsInDict(the_dict, phase, variables, build_file):
1245
1245
# Unhook the conditions list, it's no longer needed.
1246
1246
del the_dict [conditions_key ]
1247
1247
1248
+ variables_copy = variables .copy ()
1249
+
1248
1250
for condition in conditions_list :
1249
1251
merge_dict = EvalCondition (
1250
- condition , conditions_key , phase , variables , build_file
1252
+ condition , conditions_key , phase , variables_copy , build_file
1251
1253
)
1252
1254
1253
1255
if merge_dict is not None :
1254
- # Expand variables and nested conditinals in the merge_dict before
1256
+ # Expand variables and nested conditionals in the merge_dict before
1255
1257
# merging it.
1256
1258
ProcessVariablesAndConditionsInDict (
1257
- merge_dict , phase , variables , build_file
1259
+ merge_dict , phase , variables_copy , build_file
1258
1260
)
1259
1261
1260
1262
MergeDicts (the_dict , merge_dict , build_file , build_file )
1263
+ LoadAutomaticVariablesFromDict (variables_copy , the_dict )
1261
1264
1262
1265
1263
1266
def LoadAutomaticVariablesFromDict (variables , the_dict ):
0 commit comments