diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-02-17 09:10:05 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-02-17 10:26:35 +0100 |
| commit | c07b1807d19a2356a22daa8ab6b5cff9e3ef1f0e (patch) | |
| tree | 8af1705a902db007da55aac223ebe2e33012b6ac /builder | |
| parent | e233705379399776270296b8e350e8b14754d82a (diff) | |
| download | xdg-app-c07b1807d19a2356a22daa8ab6b5cff9e3ef1f0e.tar.gz | |
builder: Move CFLAGS/CXXFLAGS handling into BuilderOptions
Diffstat (limited to 'builder')
| -rw-r--r-- | builder/builder-module.c | 9 | ||||
| -rw-r--r-- | builder/builder-options.c | 13 |
2 files changed, 12 insertions, 10 deletions
diff --git a/builder/builder-module.c b/builder/builder-module.c index 5ae29e9..7f6807d 100644 --- a/builder/builder-module.c +++ b/builder/builder-module.c @@ -759,7 +759,6 @@ builder_module_build (BuilderModule *self, int i; g_auto(GStrv) env = NULL; g_auto(GStrv) build_args = NULL; - const char *cflags, *cxxflags; g_autoptr(GFile) source_dir = NULL; g_autoptr(GFile) source_subdir = NULL; const char *source_subdir_relative = NULL; @@ -832,14 +831,6 @@ 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); - cflags = builder_options_get_cflags (self->build_options, context); - if (cflags) - env = g_environ_setenv (env, "CFLAGS", cflags, TRUE); - - cxxflags = builder_options_get_cxxflags (self->build_options, context); - if (cxxflags) - env = g_environ_setenv (env, "CXXFLAGS", cxxflags, TRUE); - if (self->cmake) { cmake_file = g_file_get_child (source_subdir, "CMakeLists.txt"); diff --git a/builder/builder-options.c b/builder/builder-options.c index a4a6868..d52109a 100644 --- a/builder/builder-options.c +++ b/builder/builder-options.c @@ -550,6 +550,7 @@ builder_options_get_env (BuilderOptions *self, BuilderContext *context) GList *l; int i; char **envp = NULL; + const char *cflags, *cxxflags; for (l = options; l != NULL; l = l->next) { @@ -577,7 +578,17 @@ builder_options_get_env (BuilderOptions *self, BuilderContext *context) } } - return builder_context_extend_env (context, envp); + envp = builder_context_extend_env (context, envp); + + cflags = builder_options_get_cflags (self, context); + if (cflags) + envp = g_environ_setenv (envp, "CFLAGS", cflags, TRUE); + + cxxflags = builder_options_get_cxxflags (self, context); + if (cxxflags) + envp = g_environ_setenv (envp, "CXXFLAGS", cxxflags, TRUE); + + return envp; } char ** |