diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-04-09 21:38:40 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-04-09 21:38:40 +0000 |
| commit | ea4a4d8a2e1342723c704972808b553021852a71 (patch) | |
| tree | 003a2e6c24f40c6eaf30bf0c07a965dd7de745b7 | |
| parent | 0f55f9d67b1b3fe607224d66b843d1d542045ebb (diff) | |
| download | src-ea4a4d8a2e1342723c704972808b553021852a71.tar.gz src-ea4a4d8a2e1342723c704972808b553021852a71.zip | |
Fix overlinking in bhyve:
libvmmapi is actually needed to be linked to libutil, not bhyve nor bhyveload
Notes
Notes:
svn path=/head/; revision=281338
| -rw-r--r-- | lib/libvmmapi/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/src.libnames.mk | 1 | ||||
| -rw-r--r-- | usr.sbin/bhyve/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/bhyveload/Makefile | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/lib/libvmmapi/Makefile b/lib/libvmmapi/Makefile index 93d3c85d1566..26cf86fbe4c0 100644 --- a/lib/libvmmapi/Makefile +++ b/lib/libvmmapi/Makefile @@ -6,6 +6,8 @@ INCS= vmmapi.h WARNS?= 2 +LIBADD= util + CFLAGS+= -I${.CURDIR} .include <bsd.lib.mk> diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index d6a9ba29ac4e..0fbad38e8790 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -229,6 +229,7 @@ _DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc \ _DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err _DP_lzma= pthread _DP_ucl= m +_DP_vmmapi= util # Define spacial cases LDADD_supcplusplus= -lsupc++ diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 5a1c2c6ceccc..bb81bcbaa7f0 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -43,7 +43,7 @@ SRCS= \ .PATH: ${.CURDIR}/../../sys/amd64/vmm SRCS+= vmm_instruction_emul.c -LIBADD= vmmapi md util pthread +LIBADD= vmmapi md pthread WARNS?= 2 diff --git a/usr.sbin/bhyveload/Makefile b/usr.sbin/bhyveload/Makefile index aa89b6c16d91..fce0c1b663e5 100644 --- a/usr.sbin/bhyveload/Makefile +++ b/usr.sbin/bhyveload/Makefile @@ -4,7 +4,7 @@ PROG= bhyveload SRCS= bhyveload.c MAN= bhyveload.8 -LIBADD= vmmapi util +LIBADD= vmmapi WARNS?= 3 |