diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-02-26 16:25:55 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-02-26 16:25:55 +0100 |
| commit | ee7b95167028fdbb2a4bd32aa686e27817d8dfe0 (patch) | |
| tree | f7a1abab0400789979f860dda724247a9bbbdef1 /libnm-core/meson.build | |
| parent | c1b3616485604f3fddfad9521cb8818cd8eece2b (diff) | |
| parent | e536d40eaea5dcdc0743b0a5e8e17faa46608a50 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'libnm-core/meson.build')
| -rw-r--r-- | libnm-core/meson.build | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libnm-core/meson.build b/libnm-core/meson.build index 4c72590e..469d4161 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -188,9 +188,12 @@ links = [ libnm_libnm_core_intern, ] +libnm_core_c_args = common_c_flags + if enable_json_validation libnm_core_sources += files('nm-json.c') deps += jansson_dep + libnm_core_c_args += ['-fcommon'] endif libnm_core = static_library( @@ -198,7 +201,7 @@ libnm_core = static_library( sources: libnm_core_sources + libnm_core_enum_sources + nm_meta_setting_source + [nm_version_macro_header], include_directories: top_inc, dependencies: deps, - c_args: common_c_flags, + c_args: libnm_core_c_args, link_with: links, ) |