diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-02-12 17:25:23 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-03-07 12:46:31 +0100 |
| commit | 675b9b536871aebcce3372923244d2b27b6e185f (patch) | |
| tree | 8ae8868d46771e7384a6ac0596b58c0bd6f5e26e /Makefile.target | |
| parent | 12f8beeb9f2b12b351ea096a296da543adc6954d (diff) | |
build-sys: link with slirp as an external project
Use the "system" libslirp if its present or requested.
Else build with a static libslirp.a if slirp/ is checked
out ("internal") or a submodule ("git").
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190212162524.31504-7-marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.target b/Makefile.target index 3b79e7074c..bd773da756 100644 --- a/Makefile.target +++ b/Makefile.target @@ -174,7 +174,6 @@ target-obj-y := block-obj-y := common-obj-y := chardev-obj-y := -slirp-obj-y := include $(SRC_PATH)/Makefile.objs dummy := $(call unnest-vars,,target-obj-y) target-obj-y-save := $(target-obj-y) @@ -188,8 +187,7 @@ dummy := $(call unnest-vars,.., \ qom-obj-y \ io-obj-y \ common-obj-y \ - common-obj-m \ - slirp-obj-y) + common-obj-m) target-obj-y := $(target-obj-y-save) all-obj-y += $(common-obj-y) all-obj-y += $(target-obj-y) @@ -199,7 +197,6 @@ all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y) all-obj-$(CONFIG_USER_ONLY) += $(crypto-aes-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y) -all-obj-$(CONFIG_SOFTMMU) += $(slirp-obj-y) $(QEMU_PROG_BUILD): config-devices.mak |