Skip to content

Commit b756cd2

Browse files
committed
try gyp fix
1 parent 3805af4 commit b756cd2

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

tools/gyp/pylib/gyp/input.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,19 +1245,22 @@ def ProcessConditionsInDict(the_dict, phase, variables, build_file):
12451245
# Unhook the conditions list, it's no longer needed.
12461246
del the_dict[conditions_key]
12471247

1248+
variables_copy = variables.copy()
1249+
12481250
for condition in conditions_list:
12491251
merge_dict = EvalCondition(
1250-
condition, conditions_key, phase, variables, build_file
1252+
condition, conditions_key, phase, variables_copy, build_file
12511253
)
12521254

12531255
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
12551257
# merging it.
12561258
ProcessVariablesAndConditionsInDict(
1257-
merge_dict, phase, variables, build_file
1259+
merge_dict, phase, variables_copy, build_file
12581260
)
12591261

12601262
MergeDicts(the_dict, merge_dict, build_file, build_file)
1263+
LoadAutomaticVariablesFromDict(variables_copy, the_dict)
12611264

12621265

12631266
def LoadAutomaticVariablesFromDict(variables, the_dict):

0 commit comments

Comments
 (0)