From 1f4a2bd985ab741e817362074700b8c378f804e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 31 Aug 2010 22:57:33 +0000 Subject: [PATCH] boot_net: Disable TCP for all archs but ppc Unbreaks the build until a better solution is found. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38485 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/loader/net/Jamfile | 7 ++++++- src/system/boot/loader/net/NetStack.cpp | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/system/boot/loader/net/Jamfile b/src/system/boot/loader/net/Jamfile index 8a8245fb68..32c679c61e 100644 --- a/src/system/boot/loader/net/Jamfile +++ b/src/system/boot/loader/net/Jamfile @@ -4,6 +4,11 @@ UsePrivateHeaders kernel [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) SubDirC++Flags -fno-rtti ; +local tcp = ; +if $(TARGET_ARCH) = ppc { + tcp = TCP.cpp ; +} + KernelStaticLibrary boot_net : ARP.cpp ChainBuffer.cpp @@ -13,7 +18,7 @@ KernelStaticLibrary boot_net : NetStack.cpp RemoteDisk.cpp UDP.cpp - TCP.cpp + $(tcp) : -fno-pic ; diff --git a/src/system/boot/loader/net/NetStack.cpp b/src/system/boot/loader/net/NetStack.cpp index 0154997787..52b354387d 100644 --- a/src/system/boot/loader/net/NetStack.cpp +++ b/src/system/boot/loader/net/NetStack.cpp @@ -76,6 +76,7 @@ NetStack::Init() if (error != B_OK) return error; +#ifdef __POWERPC__ // TCP service fTCPService = new(nothrow) TCPService(fIPService); if (fTCPService == NULL) @@ -83,6 +84,7 @@ NetStack::Init() error = fTCPService->Init(); if (error != B_OK) return error; +#endif return B_OK; }