beremiz

Support unicode in LDFLAGS returned by extensions

2018-05-07, Edouard Tisserant
2076df8743b5
Parents 15cd0000350d
Children 28af541d776b
Support unicode in LDFLAGS returned by extensions
1 files changed, 5 insertions(+), 6 deletions(-)
  • +5 -6
    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():