diff options
| author | Fam Zheng <famz@redhat.com> | 2017-09-07 16:53:16 +0800 |
|---|---|---|
| committer | Eduardo Otubo <otubo@redhat.com> | 2017-09-15 10:16:05 +0200 |
| commit | c3883e1f935bf11ef0d2b8157b0022ace3d0e77d (patch) | |
| tree | 504ae879ac429d3bfe974ec05ed5c61bcf3ac205 | |
| parent | 24f8cdc5722476e12d8e39d71f66311b4fa971c1 (diff) | |
| download | focaccia-qemu-c3883e1f935bf11ef0d2b8157b0022ace3d0e77d.tar.gz focaccia-qemu-c3883e1f935bf11ef0d2b8157b0022ace3d0e77d.zip | |
buildsys: Move seccomp cflags/libs to per object
Like many other libraries, libseccomp cflags and libs should only apply to the building of necessary objects. Do so in the usual way with the help of per object variables. Signed-off-by: Fam Zheng <famz@redhat.com>
| -rw-r--r-- | Makefile.objs | 2 | ||||
| -rwxr-xr-x | configure | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.objs b/Makefile.objs index 24a4ea08b8..d9cf7ad791 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -70,6 +70,8 @@ common-obj-y += backends/ common-obj-y += chardev/ common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o +qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS) +qemu-seccomp.o-libs := $(SECCOMP_LIBS) common-obj-$(CONFIG_FDT) += device_tree.o diff --git a/configure b/configure index 9ee4559b54..94db2d103e 100755 --- a/configure +++ b/configure @@ -2035,8 +2035,8 @@ if test "$seccomp" != "no" ; then if test "$libseccomp_minver" != "" && $pkg_config --atleast-version=$libseccomp_minver libseccomp ; then - libs_softmmu="$libs_softmmu $($pkg_config --libs libseccomp)" - QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags libseccomp)" + seccomp_cflags="$($pkg_config --cflags libseccomp)" + seccomp_libs="$($pkg_config --libs libseccomp)" seccomp="yes" else if test "$seccomp" = "yes" ; then @@ -5829,6 +5829,8 @@ fi if test "$seccomp" = "yes"; then echo "CONFIG_SECCOMP=y" >> $config_host_mak + echo "SECCOMP_CFLAGS=$seccomp_cflags" >> $config_host_mak + echo "SECCOMP_LIBS=$seccomp_libs" >> $config_host_mak fi # XXX: suppress that |