build: Deprecate SetSubDirSupportedPlatformsBeOSCompatible.

By default, all targets support the "haiku" platform, and we no longer
support building for BeOS, Dan0, Zeta, or other BeOS-compatible targets,
so this is no longer needed.

Also remove all references to the non-Haiku compatible platforms, and
change all BEOS_COMPATIBLE checks to HAIKU_COMPATIBLE. Removal of
all SetSubDirSupportedPlatformsBeOSCompatible invocations
will be in the next commit.

build/jam/BuildSetup

@@ -96,12 +96,6 @@ ProcessCommandLineArguments ;
 # supported debug levels
 HAIKU_DEBUG_LEVELS = 0 1 2 3 4 5 ;
 
-# BeOS, BONE, Dan0 compatible platforms
-HAIKU_BEOS_COMPATIBLE_PLATFORMS = haiku r5 bone dano haiku_host ;
-HAIKU_BONE_COMPATIBLE_PLATFORMS = haiku bone dano haiku_host ;
-HAIKU_DANO_COMPATIBLE_PLATFORMS = haiku dano haiku_host ;
-HAIKU_HAIKU_COMPATIBLE_PLATFORMS = haiku haiku_host ;
-
 # configuration header directories
 HAIKU_CONFIG_HEADERS = [ FDirName $(HAIKU_TOP) build user_config_headers ]
 	[ FDirName $(HAIKU_TOP) build config_headers ] ;
@@ -120,11 +114,6 @@ for architecture in $(HAIKU_PACKAGING_ARCHS) {
 	ArchitectureSetup $(architecture) ;
 }
 
-# TODO: Might not be needed anymore.
-if $(HAIKU_HOST_BUILD_ONLY) = 1 {
-	HAIKU_GCC_VERSION = 0 0 0 ;
-}
-
 if $(HAIKU_PACKAGING_ARCH) {
 	KernelArchitectureSetup $(HAIKU_PACKAGING_ARCH) ;
 }
@@ -368,8 +357,8 @@ HOST_PRIVATE_KERNEL_HEADERS = ;
 # private shared kernel/libroot headers
 HOST_PRIVATE_SYSTEM_HEADERS = ;
 
-# under BeOS use copyattr instead of cp
+# under Haiku use copyattr instead of cp
-if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	CP = copyattr --data ;
 }
 
@@ -387,7 +376,7 @@ HOST_LIBROOT = libroot_build_function_remapper.a libroot_build.so ;
 HOST_STATIC_LIBROOT = libroot_build_function_remapper.a libroot_build.a ;
 HOST_LIBBE = libbe_build.so ;
 
-if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	# the C++ standard and support libraries
 	if $(HOST_GCC_VERSION[1]) < 3 {
 		HOST_LIBSTDC++ = stdc++.r4 ;

build/jam/HelperRules

@@ -170,33 +170,16 @@ rule SetPlatformCompatibilityFlagVariables
 		EXIT "specify it manually." ;
 	}
 
-	# special case: Haiku libbe.so built for testing under BeOS
+	# special case: Haiku libbe.so built for testing under Haiku
 	if $(platform) = libbe_test {
 		platform = $(HOST_PLATFORM) ;
 	}
 
-	$(varPrefix)_PLATFORM_BEOS_COMPATIBLE = ;
+	# unset variables first
-	$(varPrefix)_PLATFORM_BONE_COMPATIBLE = ;
-	$(varPrefix)_PLATFORM_DANO_COMPATIBLE = ;
 	$(varPrefix)_PLATFORM_HAIKU_COMPATIBLE = ;
 
 	switch $(platform)
 	{
-		case r5 :
-		{
-			$(varPrefix)_PLATFORM_BEOS_COMPATIBLE = true ;
-		}
-
-		case bone :
-		{
-			$(varPrefix)_PLATFORM_BONE_COMPATIBLE = true ;
-		}
-
-		case dano :
-		{
-			$(varPrefix)_PLATFORM_DANO_COMPATIBLE = true ;
-		}
-
 		case haiku_host :
 		{
 			$(varPrefix)_PLATFORM_HAIKU_COMPATIBLE = true ;
@@ -218,30 +201,11 @@ rule SetPlatformCompatibilityFlagVariables
 		}
 	}
 
-	# set lesser flags, e.g. "DANO" for "HAIKU" and "BEOS" for "BONE"
-	$(varPrefix)_PLATFORM_HAIKU_COMPATIBLE
-		?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ;
-	$(varPrefix)_PLATFORM_DANO_COMPATIBLE
-		?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ;
-	$(varPrefix)_PLATFORM_BONE_COMPATIBLE
-		?= $($(varPrefix)_PLATFORM_DANO_COMPATIBLE) ;
-	$(varPrefix)_PLATFORM_BEOS_COMPATIBLE
-		?= $($(varPrefix)_PLATFORM_BONE_COMPATIBLE) ;
-
 	# set the machine friendly flags
 	$(varPrefix)_PLATFORM_(haiku)_COMPATIBLE
 		?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ;
 	$(varPrefix)_PLATFORM_(haiku_host)_COMPATIBLE
 		?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ;
-	$(varPrefix)_PLATFORM_(dano)_COMPATIBLE
-		?= $($(varPrefix)_PLATFORM_DANO_COMPATIBLE) ;
-	$(varPrefix)_PLATFORM_(bone)_COMPATIBLE
-		?= $($(varPrefix)_PLATFORM_BONE_COMPATIBLE) ;
-	$(varPrefix)_PLATFORM_(r5)_COMPATIBLE
-		?= $($(varPrefix)_PLATFORM_BEOS_COMPATIBLE) ;
-
-	$(varPrefix)_PLATFORM_(libbe_test)_COMPATIBLE
-		?= $($(varPrefix)_PLATFORM_BEOS_COMPATIBLE) ;
 }
 
 rule FAnalyzeGCCVersion
@@ -328,9 +292,6 @@ rule AddSubDirSupportedPlatforms
 
 rule SetSubDirSupportedPlatformsBeOSCompatible
 {
-	# SetSubDirSupportedPlatformsBeOSCompatible ;
-
-	SUPPORTED_PLATFORMS = $(HAIKU_BEOS_COMPATIBLE_PLATFORMS) ;
 }
 
 rule IsPlatformSupportedForTarget

headers/build/HaikuBuildCompatibility.h

@@ -10,13 +10,6 @@
 	kludges in our source files at a minimum.
 */
 
-#ifdef HAIKU_HOST_PLATFORM_DANO
-#	include <be_setup.h>
-#	include <be_errors.h>
-#	define _ERRORS_H
-		// this is what Haiku/BeOS is using
-#endif
-
 #ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST
 #	define _BE_ERRNO_H_
 		// this is what Dano/Zeta is using
@@ -149,28 +142,15 @@ extern float	roundf(float value);
 #	endif
 #endif	// HAIKU_TARGET_PLATFORM_LIBBE_TEST
 
-#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
-#	define B_REDO						'REDO'
-#	define B_BAD_DATA					(B_NOT_ALLOWED + 1)
-#	define B_DOCUMENT_BACKGROUND_COLOR	B_PANEL_BACKGROUND_COLOR
-#	define B_DOCUMENT_TEXT_COLOR		B_MENU_ITEM_TEXT_COLOR
-#endif
-
 #if !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) \
 	&& !defined(HAIKU_HOST_PLATFORM_HAIKU)
-#	if !defined(B_NOT_SUPPORTED) && !defined(HAIKU_HOST_PLATFORM_DANO)
+#	if !defined(B_NOT_SUPPORTED)
 #		define B_NOT_SUPPORTED			(B_ERROR)
 #	endif
 #	define B_KERNEL_READ_AREA			0
 #	define B_KERNEL_WRITE_AREA			0
 #endif
 
-#if defined(HAIKU_TARGET_PLATFORM_BONE) || defined(HAIKU_TARGET_PLATFORM_DANO)
-#	define IF_NAMESIZE IFNAMSIZ
-#	define ifc_value ifc_val
-#	define IFF_AUTO_CONFIGURED 0
-#endif
-
 #include <limits.h>
 
 #ifndef INT32_MAX

src/add-ons/print/transports/shared/Jamfile

@@ -2,12 +2,6 @@ SubDir HAIKU_TOP src add-ons print transports shared ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM_BONE_COMPATIBLE) {
-	ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET -Dclosesocket=close ;
-} else {
-	ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET -DBUILDING_R5_LIBNET ;
-}
-
 Objects
 	DbgMsg.cpp
 	Socket.cpp

src/add-ons/print/transports/shared/Socket.cpp

@@ -1,13 +1,9 @@
 // Sun, 18 Jun 2000
 // Y.Takagi
 
-#if defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_BONE)
+#include <sys/socket.h>
-#	include <sys/socket.h>
-#else
-#	include <net/socket.h>
-#endif
 #include <netdb.h>
-#include <arpa/inet.h>	
+#include <arpa/inet.h>
 
 #include <stdio.h>
 #include <string.h>

src/bin/network/arp/Jamfile

@@ -1,13 +1,5 @@
 SubDir HAIKU_TOP src bin network arp ;
 
-SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
-
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# We need the public network headers also when not compiling for Haiku.
-		# Unfortunately we get more than we want, namely all POSIX headers.
-}
-
 UsePrivateHeaders net ;
 UsePrivateSystemHeaders ;
 
@@ -20,7 +12,7 @@ HaikuInstall install-networking
 	: [ FDirName $(HAIKU_TEST_DIR) kits net ]
 	: arp ;
 
-HaikuInstall install-userland-networking 
+HaikuInstall install-userland-networking
 	: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
 	: arp
 	: installed-userland-networking

src/bin/network/ftp/Jamfile

@@ -1,13 +1,5 @@
 SubDir HAIKU_TOP src bin network ftp ;
 
-SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
-
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# We need the public network headers also when not compiling for Haiku.
-		# Unfortunately we get more than we want, namely all POSIX headers.
-}
-
 UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
 SubDirCcFlags [ FDefines _BSD_SOURCE=1 ] ;
 

src/bin/network/ftpd/Jamfile

@@ -1,13 +1,5 @@
 SubDir HAIKU_TOP src bin network ftpd ;
 
-SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
-
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# We need the public network headers also when not compiling for Haiku.
-		# Unfortunately we get more than we want, namely all POSIX headers.
-}
-
 UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
 UseHeaders $(SUBDIR) : true ;
 SubDirCcFlags [ FDefines _BSD_SOURCE=1 ] ;

src/bin/network/ping/Jamfile

@@ -1,13 +1,5 @@
 SubDir HAIKU_TOP src bin network ping ;
 
-SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
-
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# We need the public network headers also when not compiling for Haiku.
-		# Unfortunately we get more than we want, namely all POSIX headers.
-}
-
 BinCommand ping :
 	ping.c
 	: $(TARGET_NETWORK_LIBS) $(TARGET_SELECT_UNAME_ETC_LIB) ;
@@ -17,7 +9,7 @@ HaikuInstall install-networking
 	: [ FDirName $(HAIKU_TEST_DIR) kits net ]
 	: ping ;
 
-HaikuInstall install-userland-networking 
+HaikuInstall install-userland-networking
 	: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
 	: ping
 	: installed-userland-networking

src/bin/network/ping6/Jamfile

@@ -1,13 +1,5 @@
 SubDir HAIKU_TOP src bin network ping6 ;
 
-SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
-
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# We need the public network headers also when not compiling for Haiku.
-		# Unfortunately we get more than we want, namely all POSIX headers.
-}
-
 UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
 
 BinCommand ping6 :

src/bin/network/ppp_up/Jamfile

@@ -1,13 +1,5 @@
 SubDir HAIKU_TOP src bin network ppp_up ;
 
-SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
-
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# We need the public network headers also when not compiling for Haiku.
-		# Unfortunately we get more than we want, namely all POSIX headers.
-}
-
 UsePrivateKernelHeaders ;
 UsePrivateHeaders net app libroot shared interface libbe be root tracker textencoding
 			root ;

src/bin/network/pppconfig/Jamfile

@@ -1,13 +1,5 @@
 SubDir HAIKU_TOP src bin network pppconfig ;
 
-SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
-
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# We need the public network headers also when not compiling for Haiku.
-		# Unfortunately we get more than we want, namely all POSIX headers.
-}
-
 UsePrivateKernelHeaders ;
 UsePrivateHeaders net ;
 UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libppp

src/bin/network/traceroute/Jamfile

@@ -1,13 +1,5 @@
 SubDir HAIKU_TOP src bin network traceroute ;
 
-SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
-
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-		# We need the public network headers also when not compiling for Haiku.
-		# Unfortunately we get more than we want, namely all POSIX headers.
-}
-
 local defines = [ FDefines HAVE_MALLOC_H=1 HAVE_SYS_SELECT=1 HAVE_NET_ROUTE_H=1
 			   HAVE_STRERROR=1 HAVE_USLEEP=1 HAVE_SETLINEBUF=1
 			   BYTESWAP_IP_HDR=1 HAVE_MALLOC_H=1
@@ -28,7 +20,7 @@ HaikuInstall install-networking
 	: [ FDirName $(HAIKU_TEST_DIR) kits net ]
 	: traceroute ;
 
-HaikuInstall install-userland-networking 
+HaikuInstall install-userland-networking
 	: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
 	: traceroute
 	: installed-userland-networking

src/libs/bsd/Jamfile

@@ -1,7 +1,5 @@
 SubDir HAIKU_TOP src libs bsd ;
 
-SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
-
 UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
 
 SubDirCcFlags [ FDefines _BSD_SOURCE=1 ] ;

src/libs/libtelnet/Jamfile

@@ -1,7 +1,5 @@
 SubDir HAIKU_TOP src libs libtelnet ;
 
-SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
-
 UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
 SubDirCcFlags [ FDefines _BSD_SOURCE=1 ] ;
 

src/libs/util/Jamfile

@@ -1,7 +1,5 @@
 SubDir HAIKU_TOP src libs util ;
 
-SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
-
 UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
 
 local defines = [ FDefines SCCSID=0 _BSD_SOURCE=1 ] ;

src/preferences/media/Jamfile

@@ -2,10 +2,6 @@ SubDir HAIKU_TOP src preferences media ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-	SubDirC++Flags -fmultiple-symbol-spaces ;
-}
-
 UsePrivateHeaders media midi shared ;
 
 Preference Media :

src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/Jamfile

@@ -21,7 +21,7 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
 
 # platform specific libraries
 local fsShellCommandLibs ;
-if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	fsShellCommandLibs = $(HOST_NETWORK_LIBS) ;
 }
 

src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile

@@ -24,13 +24,13 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
 
 # platform specific libraries
 local fsShellCommandLibs ;
-if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	fsShellCommandLibs = $(HOST_NETWORK_LIBS) ;
 }
 
 UseHeaders [ FDirName $(HAIKU_TOP) headers build ] : true ;
 
-if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers build os ] : true ;
 	UseHeaders [ FDirName $(HAIKU_TOP) headers build os support ] : true ;
 }

src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile

@@ -23,13 +23,13 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
 
 # platform specific libraries
 local fsShellCommandLibs ;
-if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	fsShellCommandLibs = $(HOST_NETWORK_LIBS) ;
 }
 
 UseHeaders [ FDirName $(HAIKU_TOP) headers build ] : true ;
 
-if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers build os ] : true ;
 	UseHeaders [ FDirName $(HAIKU_TOP) headers build os support ] : true ;
 }

src/tests/system/kernel/Jamfile

@@ -65,8 +65,6 @@ SimpleTest spinlock_contention : spinlock_contention.cpp ;
 SimpleTest syscall_restart_test : syscall_restart_test.cpp
 	: network [ TargetLibsupc++ ] ;
 
-SetSupportedPlatformsForTarget syscall_time
-	: $(HAIKU_BEOS_COMPATIBLE_PLATFORMS) ;
 SimpleTest syscall_time : syscall_time.cpp ;
 
 SimpleTest transfer_area_test : transfer_area_test.cpp ;
@@ -80,12 +78,8 @@ SimpleTest wait_for_objects_test : wait_for_objects_test.cpp ;
 
 SimpleTest yield_test : yield_test.cpp ;
 
-SetSupportedPlatformsForTarget sigint_bug113_test
-	: $(HAIKU_BEOS_COMPATIBLE_PLATFORMS) ;
 SimpleTest sigint_bug113_test : sigint_bug113_test.cpp ;
 
-SetSupportedPlatformsForTarget set_area_protection_test1
-	: $(HAIKU_BEOS_COMPATIBLE_PLATFORMS) ;
 SimpleTest set_area_protection_test1 : set_area_protection_test1.cpp ;
 
 SimpleTest sigsuspend_test : sigsuspend_test.cpp ;

src/tools/bfs_shell/Jamfile

@@ -24,13 +24,13 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
 
 # platform specific libraries
 local fsShellCommandLibs ;
-if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	fsShellCommandLibs = $(HOST_NETWORK_LIBS) ;
 }
 
 UseHeaders [ FDirName $(HAIKU_TOP) headers build ] : true ;
 
-if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers build os ] : true ;
 	UseHeaders [ FDirName $(HAIKU_TOP) headers build os support ] : true ;
 }

src/tools/fs_shell/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src tools fs_shell ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) headers build ] : true ;
 
-if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers build os ] : true ;
 	UseHeaders [ FDirName $(HAIKU_TOP) headers build os kernel ] : true ;
 	UseHeaders [ FDirName $(HAIKU_TOP) headers build os storage ] : true ;
@@ -21,7 +21,7 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
 local fsShellCommandSources ;
 local externalCommandsSources ;
 local fsShellCommandLibs ;
-if $(HOST_PLATFORM_BEOS_COMPATIBLE) && $(HOST_PLATFORM) != haiku_host {
+if $(HOST_PLATFORM_HAIKU_COMPATIBLE) && $(HOST_PLATFORM) != haiku_host {
 	# BeOS compatible, but not Haiku -- use BeOS ports for communication
 	fsShellCommandSources = fs_shell_command_beos.cpp ;
 	externalCommandsSources = external_commands_beos.cpp ;

src/tools/unzip/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src tools unzip ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin unzip ] ;
 
-if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	DEFINES += HAVE_TERMIOS_H=1 HAS_JUNK_EXTRA_FIELD_OPTION=1 ;
 }
 

src/tools/zip/Jamfile

@@ -4,7 +4,7 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin zip ] ;
 
 USES_BE_API on <build>zip = true ;
 
-if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	DEFINES += UNIX ;
 }