Skip to content

Commit

Permalink
try gyp fix
Browse files Browse the repository at this point in the history
  • Loading branch information
targos committed Oct 19, 2021
1 parent 3805af4 commit b756cd2
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions tools/gyp/pylib/gyp/input.py
Expand Up @@ -1245,19 +1245,22 @@ def ProcessConditionsInDict(the_dict, phase, variables, build_file):
# Unhook the conditions list, it's no longer needed.
del the_dict[conditions_key]

variables_copy = variables.copy()

for condition in conditions_list:
merge_dict = EvalCondition(
condition, conditions_key, phase, variables, build_file
condition, conditions_key, phase, variables_copy, build_file
)

if merge_dict is not None:
# Expand variables and nested conditinals in the merge_dict before
# Expand variables and nested conditionals in the merge_dict before
# merging it.
ProcessVariablesAndConditionsInDict(
merge_dict, phase, variables, build_file
merge_dict, phase, variables_copy, build_file
)

MergeDicts(the_dict, merge_dict, build_file, build_file)
LoadAutomaticVariablesFromDict(variables_copy, the_dict)


def LoadAutomaticVariablesFromDict(variables, the_dict):
Expand Down

0 comments on commit b756cd2

Please sign in to comment.