Revert "[iperf] Enable building iperf3 on the host." This reverts commit 4b00133e400fd8273743858e247b603c96dd5975. Reason for revert: Breaks build on mac builders e.g. https://ci.chromium.org/p/fuchsia/builders/ci/fuchsia-arm64-debug-mac-build_default/b8885925971347647920 Change-Id: I01a10b1c8a4154a7cd9ddbc01e1efde621f4ea41
diff --git a/BUILD.gn b/BUILD.gn index 304c9ba..29779e6 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -27,17 +27,9 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/host.gni") import("//build/package.gni") -group("iperf") { - deps = [ - ":host_tools", - ":iperf3", - ] -} - -package("iperf3") { +package("iperf") { meta = [ { path = "meta/iperf3.cmx" @@ -45,7 +37,7 @@ }, ] - deps = [ ":bin" ] + deps = [ ":iperf3" ] binaries = [ { @@ -65,8 +57,7 @@ public_deps = [ "//zircon/public/lib/fdio" ] } -executable("bin") { - output_name = "iperf3" +executable("iperf3") { sources = [ "src/cjson.c", "src/dscp.c", @@ -97,16 +88,6 @@ "-Wno-pointer-sign", "-Wno-sign-compare", ] - if (is_fuchsia) { - libs = [ "zircon" ] - deps = [ ":fuchsia-compat" ] - } -} - -install_host_tools("host_tools") { - deps = [ ":bin" ] - - # Note that for convenience, we are compiling iperf3 on the host-build - # with src/iperf_config.h used in Fuchsia build. - outputs = [ "iperf3" ] + libs = [ "zircon" ] + deps = [ ":fuchsia-compat" ] }