From ceb6e26ff100464083581ca64816474d1339bea5 Mon Sep 17 00:00:00 2001 From: Hemmo Nieminen Date: Fri, 25 Feb 2022 13:19:26 +0200 Subject: boost: preserve compiler/linker argument order Looks like boost dependency mixes up it's compiler and linker argument order when it is removing duplicates (?) from those. This causes unnecessary recompilations of everything depending on those components. Use OrderedSet to remove the duplicates while also maintaining consistent order for them. --- mesonbuild/dependencies/boost.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mesonbuild/dependencies') diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py index 318bca2..544e844 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py @@ -487,8 +487,8 @@ class BoostDependency(SystemDependency): comp_args += c_args link_args += l_args - comp_args = list(set(comp_args)) - link_args = list(set(link_args)) + comp_args = list(mesonlib.OrderedSet(comp_args)) + link_args = list(mesonlib.OrderedSet(link_args)) self.modules_found = [x.mod_name for x in selected_modules] self.modules_found = [x[6:] for x in self.modules_found] -- cgit v1.1