Skip to content

L
lxc
Commit 20d2e91b by Stéphane Graber
Options

No need to link against rt and util on bionic

When building on bionic, -lrt and -lutil only cause a build failure. Dropping those fixes the build, so it appears that the symbols are defined in the main library. This commit moves -lrt and -lutil under a !IS_BIONIC check. Signed-off-by: 's avatarStéphane Graber <stgraber@ubuntu.com> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent 1ba0013f
Showing with 10 additions and 2 deletions
src/lxc/Makefile.am
...@@ -94,7 +94,11 @@ liblxc_so_LDFLAGS = \ ...@@ -94,7 +94,11 @@ liblxc_so_LDFLAGS = \
-shared \ -shared \
-Wl,-soname,liblxc.so.$(firstword $(subst ., ,$(VERSION))) -Wl,-soname,liblxc.so.$(firstword $(subst ., ,$(VERSION)))
liblxc_so_LDADD = -lutil $(CAP_LIBS) $(APPARMOR_LIBS) $(SECCOMP_LIBS) -lrt liblxc_so_LDADD = $(CAP_LIBS) $(APPARMOR_LIBS) $(SECCOMP_LIBS)
if !IS_BIONIC
liblxc_so_LDADD += -lutil -lrt
endif
bin_SCRIPTS = \ bin_SCRIPTS = \
lxc-ps \ lxc-ps \
...@@ -140,7 +144,11 @@ AM_LDFLAGS = -Wl,-E ...@@ -140,7 +144,11 @@ AM_LDFLAGS = -Wl,-E
if ENABLE_RPATH if ENABLE_RPATH
AM_LDFLAGS += -Wl,-rpath -Wl,$(libdir) AM_LDFLAGS += -Wl,-rpath -Wl,$(libdir)
endif endif
LDADD=liblxc.so @CAP_LIBS@ @APPARMOR_LIBS@ @SECCOMP_LIBS@ -lrt LDADD=liblxc.so @CAP_LIBS@ @APPARMOR_LIBS@ @SECCOMP_LIBS@
if !IS_BIONIC
LDADD += -lrt
endif
lxc_attach_SOURCES = lxc_attach.c lxc_attach_SOURCES = lxc_attach.c
lxc_cgroup_SOURCES = lxc_cgroup.c lxc_cgroup_SOURCES = lxc_cgroup.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment