From 84dcd2c3136c72ae745b21a92509411272fa8f69 Mon Sep 17 00:00:00 2001 From: Grissiom Date: Wed, 8 Oct 2014 12:18:45 +0800 Subject: [PATCH] tools: preserve the order of CPPPATH/CPPDEFINES/LIBPATH/LIBS The order of them are important while the uniqueness has nothing to do with the compiling. commit 2c5eea4c21ea66f711974ab6ce1048337f7b9efc in upstream. --- tools/building.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/building.py b/tools/building.py index bb0fcdcb6..3c2dbc4e7 100644 --- a/tools/building.py +++ b/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) -- GitLab