diff options
author | Keno Fischer <keno@juliacomputing.com> | 2018-06-16 20:56:57 -0400 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-08-17 14:29:49 +0100 |
commit | 002aeff3204c520be13ca06fff4814918886bba4 (patch) | |
tree | 1e27440c96d9559a659d3359f2bfebe909fc79b1 | |
parent | 195f341e3d81d5bc506ff1190cbd1964648a9687 (diff) |
9p: darwin: configure: Allow VirtFS on Darwindarwin-9p
Signed-off-by: Keno Fischer <keno@juliacomputing.com>
-rw-r--r-- | Makefile.objs | 1 | ||||
-rwxr-xr-x | configure | 22 |
2 files changed, 16 insertions, 7 deletions
diff --git a/Makefile.objs b/Makefile.objs index 7a9828da28..c968a9aedd 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -104,6 +104,7 @@ common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o common-obj-$(CONFIG_LINUX) += fsdev/ +common-obj-$(CONFIG_DARWIN) += fsdev/ common-obj-y += migration/ @@ -5636,16 +5636,28 @@ if test "$want_tools" = "yes" ; then fi fi if test "$softmmu" = yes ; then - if test "$linux" = yes; then - if test "$virtfs" != no && test "$cap" = yes && test "$attr" = yes ; then + if test "$virtfs" != no; then + if test "$linux" = yes; then + if test "$cap" = yes && test "$attr" = yes ; then + virtfs=yes + tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)" + else + if test "$virtfs" = yes; then + error_exit "VirtFS requires libcap devel and libattr devel under Linux" + fi + virtfs=no + fi + elif test "$darwin" = yes; then virtfs=yes tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)" else if test "$virtfs" = yes; then - error_exit "VirtFS requires libcap devel and libattr devel" + error_exit "VirtFS is supported only on Linux and Darwin" fi virtfs=no fi + fi + if test "$linux" = yes; then if test "$mpath" != no && test "$mpathpersist" = yes ; then mpath=yes else @@ -5656,10 +5668,6 @@ if test "$softmmu" = yes ; then fi tools="$tools scsi/qemu-pr-helper\$(EXESUF)" else - if test "$virtfs" = yes; then - error_exit "VirtFS is supported only on Linux" - fi - virtfs=no if test "$mpath" = yes; then error_exit "Multipath is supported only on Linux" fi |