提交 82ccf7da authored 作者: Pascal Lamblin's avatar Pascal Lamblin

Try to preserve order in headers/includes/dirs/...

上级 e523802f
...@@ -742,7 +742,7 @@ class CLinker(link.Linker): ...@@ -742,7 +742,7 @@ class CLinker(link.Linker):
c_compiler = self.c_compiler() c_compiler = self.c_compiler()
ret = list(set(ret)) # to remove duplicate ret = utils.uniq(ret) # to remove duplicate
# The args set by the compiler include the user flags. We do not want # The args set by the compiler include the user flags. We do not want
# to reorder them # to reorder them
ret += c_compiler.compile_args() ret += c_compiler.compile_args()
...@@ -772,7 +772,7 @@ class CLinker(link.Linker): ...@@ -772,7 +772,7 @@ class CLinker(link.Linker):
ret += x.c_headers() ret += x.c_headers()
except utils.MethodNotDefined: except utils.MethodNotDefined:
pass pass
return list(set(ret)) return utils.uniq(ret)
def c_compiler(self): def c_compiler(self):
c_compiler = None c_compiler = None
...@@ -809,7 +809,7 @@ class CLinker(link.Linker): ...@@ -809,7 +809,7 @@ class CLinker(link.Linker):
ret += x.c_header_dirs() ret += x.c_header_dirs()
except utils.MethodNotDefined: except utils.MethodNotDefined:
pass pass
return list(set(ret)) return utils.uniq(ret)
def libraries(self): def libraries(self):
"""WRITEME """WRITEME
...@@ -825,7 +825,7 @@ class CLinker(link.Linker): ...@@ -825,7 +825,7 @@ class CLinker(link.Linker):
ret += x.c_libraries() ret += x.c_libraries()
except utils.MethodNotDefined: except utils.MethodNotDefined:
pass pass
return list(set(ret)) return utils.uniq(ret)
def lib_dirs(self): def lib_dirs(self):
"""WRITEME """WRITEME
...@@ -841,7 +841,7 @@ class CLinker(link.Linker): ...@@ -841,7 +841,7 @@ class CLinker(link.Linker):
ret += x.c_lib_dirs() ret += x.c_lib_dirs()
except utils.MethodNotDefined: except utils.MethodNotDefined:
pass pass
return list(set(ret)) return utils.uniq(ret)
def __compile__(self, input_storage=None, def __compile__(self, input_storage=None,
output_storage=None, keep_lock=False): output_storage=None, keep_lock=False):
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论