ConfigTreeNode.py
changeset 2003 2076df8743b5
parent 1932 65d2dbbf7022
child 2004 28af541d776b
equal deleted inserted replaced
2002:15cd0000350d 2003:2076df8743b5
   272             LocationCFilesAndCFLAGS = [(self.GetCurrentLocation(), CTNCFilesAndCFLAGS, DoCalls)]
   272             LocationCFilesAndCFLAGS = [(self.GetCurrentLocation(), CTNCFilesAndCFLAGS, DoCalls)]
   273         else:
   273         else:
   274             LocationCFilesAndCFLAGS = []
   274             LocationCFilesAndCFLAGS = []
   275 
   275 
   276         # confnode asks for some LDFLAGS
   276         # confnode asks for some LDFLAGS
   277         if CTNLDFLAGS:
   277         LDFLAGS = []
       
   278         if CTNLDFLAGS is not None:
   278             # LDFLAGS can be either string
   279             # LDFLAGS can be either string
   279             if isinstance(CTNLDFLAGS, str):
   280             if isinstance(CTNLDFLAGS, str) or isinstance(CTNLDFLAGS, unicode):
   280                 LDFLAGS = [CTNLDFLAGS]
   281                 LDFLAGS += [CTNLDFLAGS]
   281             # or list of strings
   282             # or list of strings
   282             elif isinstance(CTNLDFLAGS, list):
   283             elif isinstance(CTNLDFLAGS, list):
   283                 LDFLAGS = CTNLDFLAGS[:]
   284                 LDFLAGS += CTNLDFLAGS
   284         else:
       
   285             LDFLAGS = []
       
   286 
   285 
   287         # recurse through all children, and stack their results
   286         # recurse through all children, and stack their results
   288         for CTNChild in self.IECSortedChildren():
   287         for CTNChild in self.IECSortedChildren():
   289             new_location = CTNChild.GetCurrentLocation()
   288             new_location = CTNChild.GetCurrentLocation()
   290             # How deep are we in the tree ?
   289             # How deep are we in the tree ?