Sfoglia il codice sorgente

Merge pull request #350 from grissiom/fix-tools-stable

tools: preserve the order of CPPPATH/CPPDEFINES/LIBPATH/LIBS
Bernard Xiong 11 anni fa
parent
commit
8b8d69f66e
1 ha cambiato i file con 0 aggiunte e 6 eliminazioni
  1. 0 6
      tools/building.py

+ 0 - 6
tools/building.py

@@ -435,12 +435,6 @@ def DoBuilding(target, objects):
 
                 break
     else:
-        # merge the repeated items in the Env
-        if Env.has_key('CPPPATH')   : Env['CPPPATH'] = list(set(Env['CPPPATH']))
-        if Env.has_key('CPPDEFINES'): Env['CPPDEFINES'] = list(set(Env['CPPDEFINES']))
-        if Env.has_key('LIBPATH')   : Env['LIBPATH'] = list(set(Env['LIBPATH']))
-        if Env.has_key('LIBS')      : Env['LIBS'] = list(set(Env['LIBS']))
-
         program = Env.Program(target, objects)
 
     EndBuilding(target, program)