diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-08-31 13:31:27 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-08-31 13:31:42 +0200 |
| commit | a8929bbfc3682df3091865aceb7410f38bbb5357 (patch) | |
| tree | 8f9b938997652688541a1d25eda60e44b782ee19 /Makefile.am | |
| parent | 6bd506dfb8fb713f84941a6f036af3519a15e038 (diff) | |
| download | NetworkManager-a8929bbfc3682df3091865aceb7410f38bbb5357.tar.gz | |
Revert "build: add way to keep unused symbols when linking NetworkManager"th/fix-nm-sudo-symbols-for-ovs
This approach does not seem to work with clang 3.4 (rhel-7). Instead,
make sure we actually use the symbol in NetworkManager so that it gets
preserved for the OVS device plugin.
This reverts commit 684f2acffea3ed5704330bff05b87acbf371ccdd.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 25ea649484..bb59bf8354 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2662,14 +2662,6 @@ $(src_core_libNetworkManagerTest_la_OBJECTS): $(src_libnm_core_public_mkenums_h) ############################################################################### -# NetworkManager binary also must contain symbols that are not used by the binary -# itself, but by the plugins (that are dlopened). We need to explicitly include -# them during linking. -networkmanager_undefined_symbols = \ - nm_sudo_call_get_fd \ - nm_sudo_utils_open_fd \ - $(NULL) - noinst_PROGRAMS += src/core/NetworkManager-all-sym src_core_NetworkManager_all_sym_CPPFLAGS = $(src_core_cppflags) @@ -2684,7 +2676,6 @@ src_core_NetworkManager_all_sym_LDADD = \ src_core_NetworkManager_all_sym_LDFLAGS = \ -rdynamic \ - $(networkmanager_undefined_symbols:%=-u %) \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) @@ -2711,7 +2702,6 @@ src_core_NetworkManager_LDADD = \ src_core_NetworkManager_LDFLAGS = \ -rdynamic \ -Wl,--version-script="src/core/NetworkManager.ver" \ - $(networkmanager_undefined_symbols:%=-u %) \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) |