diff options
| author | Bernard Xiong <[email protected]> | 2014-10-08 13:31:59 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2014-10-08 13:31:59 +0800 |
| commit | 8b8d69f66e5296bcb5a215b91d879ac14aa3e3fc (patch) | |
| tree | 975931c2c4fa60a00b7c5e0c75bab8cab7c96328 | |
| parent | 80b66ae25ed88c0fbddea6d5adbe98448bf44396 (diff) | |
| parent | 84dcd2c3136c72ae745b21a92509411272fa8f69 (diff) | |
Merge pull request #350 from grissiom/fix-tools-stable
tools: preserve the order of CPPPATH/CPPDEFINES/LIBPATH/LIBS
| -rw-r--r-- | tools/building.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tools/building.py b/tools/building.py index bb0fcdcb65..3c2dbc4e74 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) |