diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2016-04-14 18:53:10 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-04-15 10:25:55 +0200 |
| commit | 401c7b2dea7f615d255f5859dd5d5c2fe386d490 (patch) | |
| tree | 1ebc20f8d89e99ef3c9033f849390ae07dcf1638 /builder | |
| parent | 17ec9ef3b09401e36e0797948013c0bf6191f91c (diff) | |
| download | xdg-app-401c7b2dea7f615d255f5859dd5d5c2fe386d490.tar.gz | |
BuilderModule: Use builder_options_get_config_opts()
The configure arguments are now a combination of the
default config-opts plus the accumulative sum of the config-opts
specified in the build-options that are active for a given build
context.
https://bugs.freedesktop.org/show_bug.cgi?id=94940
Diffstat (limited to 'builder')
| -rw-r--r-- | builder/builder-module.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builder/builder-module.c b/builder/builder-module.c index a522b0e..40d22c5 100644 --- a/builder/builder-module.c +++ b/builder/builder-module.c @@ -823,6 +823,7 @@ builder_module_build (BuilderModule *self, int i; g_auto(GStrv) env = NULL; g_auto(GStrv) build_args = NULL; + g_auto(GStrv) config_opts = NULL; g_autoptr(GFile) source_dir = NULL; g_autoptr(GFile) source_subdir = NULL; const char *source_subdir_relative = NULL; @@ -894,6 +895,7 @@ builder_module_build (BuilderModule *self, env = builder_options_get_env (self->build_options, context); build_args = builder_options_get_build_args (self->build_options, context); + config_opts = builder_options_get_config_opts (self->build_options, context, self->config_opts); if (self->cmake) { @@ -1009,7 +1011,7 @@ builder_module_build (BuilderModule *self, builder_options_get_prefix (self->build_options, context)); if (!build (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error, - configure_cmd, configure_prefix_arg, strv_arg, self->config_opts, configure_final_arg, NULL)) + configure_cmd, configure_prefix_arg, strv_arg, config_opts, configure_final_arg, NULL)) return FALSE; } else |