From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34412)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <laurent@vivier.eu>) id 1fQCPt-0004iS-Ns
	for qemu-devel@nongnu.org; Tue, 05 Jun 2018 09:54:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <laurent@vivier.eu>) id 1fQCPq-0007TZ-K2
	for qemu-devel@nongnu.org; Tue, 05 Jun 2018 09:54:29 -0400
Received: from mout.kundenserver.de ([212.227.126.187]:45493)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <laurent@vivier.eu>) id 1fQCPq-0007TA-AU
	for qemu-devel@nongnu.org; Tue, 05 Jun 2018 09:54:26 -0400
From: Laurent Vivier <laurent@vivier.eu>
Date: Tue,  5 Jun 2018 15:54:04 +0200
Message-Id: <20180605135404.16301-1-laurent@vivier.eu>
Subject: [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and
 socket_scm_helper build
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= <berrange@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Richard Henderson <richard.henderson@linaro.org>, Laurent Vivier <laurent@vivier.eu>

linux-user targets don't need them, and if we ask to build statically
linked binaries some static binaries they need are not available.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 Makefile               | 2 ++
 tests/Makefile.include | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 6d588d1f71..5f198ee4bb 100644
--- a/Makefile
+++ b/Makefile
@@ -351,7 +351,9 @@ $(call set-vpath, $(SRC_PATH))
 
 LIBS+=-lz $(LIBS_TOOLS)
 
+ifeq ($(CONFIG_SOFTMMU),y)
 HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
+endif
 
 ifdef BUILD_DOCS
 DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 86f90c0cb0..adaa5274c8 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -923,7 +923,9 @@ check-report.html: check-report.xml
 
 # Other tests
 
+ifeq ($(CONFIG_SOFTMMU),y)
 QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
+endif
 
 .PHONY: check-tests/qemu-iotests-quick.sh
 check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
-- 
2.14.3