summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stapelberg <stapelberg@google.com>2020-04-25 20:36:57 +0200
committerThomas Haller <thaller@redhat.com>2020-04-26 11:32:57 +0200
commitd4e33a0c2b8641b4a48eb44a89fca2debc1495a9 (patch)
treecf952e8e4043ca769765f9c16447be227c05aa29
parentdec1678fecadfcbf25ed21e4929bfd36d8008f66 (diff)
downloadNetworkManager-d4e33a0c2b8641b4a48eb44a89fca2debc1495a9.tar.gz
libnm/meson.build: stop using env -i (just env)
env -i starts with an empty environment, which is undesired when the build environment needs certain environment variables to function. One such example is a custom PYTHONPATH, which gets dropped by env -i and results in the nm-settings-docs.xml generator not finding the gi Python module. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/478
-rw-r--r--libnm/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/libnm/meson.build b/libnm/meson.build
index 98d39f8ea8..406766c707 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -255,7 +255,7 @@ if enable_introspection
ld_library_path = meson.current_build_dir() + ld_library_path
generate_setting_docs_env = [
- 'env', '-i',
+ 'env',
'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path,
]