From 4e2b10316739d3e8646f45ed69ce3f92a9943988 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 14 Mar 2017 10:37:12 +0100 Subject: [PATCH] builder: Fix ordering of arch-specific build options The arch-specific options override the generic ones, not the other way around. --- builder/builder-options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/builder-options.c b/builder/builder-options.c index b8527d31..5fd248c3 100644 --- a/builder/builder-options.c +++ b/builder/builder-options.c @@ -482,12 +482,12 @@ get_arched_options (BuilderOptions *self, BuilderContext *context) const char *arch = builder_context_get_arch (context); BuilderOptions *arch_options; + options = g_list_prepend (options, self); + arch_options = g_hash_table_lookup (self->arch, arch); if (arch_options) options = g_list_prepend (options, arch_options); - options = g_list_prepend (options, self); - return options; }