# HG changeset patch # User Edouard Tisserant # Date 1525698639 -7200 # Node ID 2076df8743b56b83bc4899d2f86074342c63294b # Parent 15cd0000350d9d6db40d3cc0244c231579599cf7 Support unicode in LDFLAGS returned by extensions diff -r 15cd0000350d -r 2076df8743b5 ConfigTreeNode.py --- a/ConfigTreeNode.py Mon May 07 14:19:08 2018 +0200 +++ b/ConfigTreeNode.py Mon May 07 15:10:39 2018 +0200 @@ -274,15 +274,14 @@ LocationCFilesAndCFLAGS = [] # confnode asks for some LDFLAGS - if CTNLDFLAGS: + LDFLAGS = [] + if CTNLDFLAGS is not None: # LDFLAGS can be either string - if isinstance(CTNLDFLAGS, str): - LDFLAGS = [CTNLDFLAGS] + if isinstance(CTNLDFLAGS, str) or isinstance(CTNLDFLAGS, unicode): + LDFLAGS += [CTNLDFLAGS] # or list of strings elif isinstance(CTNLDFLAGS, list): - LDFLAGS = CTNLDFLAGS[:] - else: - LDFLAGS = [] + LDFLAGS += CTNLDFLAGS # recurse through all children, and stack their results for CTNChild in self.IECSortedChildren():