aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies
diff options
context:
space:
mode:
authorHemmo Nieminen <hemmo.nieminen@kone.com>2022-02-25 13:19:26 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2022-03-23 20:46:59 +0200
commitceb6e26ff100464083581ca64816474d1339bea5 (patch)
tree411a26882648e5928dc81486311ed02e378f48dd /mesonbuild/dependencies
parentcc880d3ad59aae0269e3e6213e6ee56844d2d739 (diff)
downloadmeson-ceb6e26ff100464083581ca64816474d1339bea5.zip
meson-ceb6e26ff100464083581ca64816474d1339bea5.tar.gz
meson-ceb6e26ff100464083581ca64816474d1339bea5.tar.bz2
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.
Diffstat (limited to 'mesonbuild/dependencies')
-rw-r--r--mesonbuild/dependencies/boost.py4
1 files changed, 2 insertions, 2 deletions
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]