From ee074918dee7fd58e6534b6bc0f12a5f5a9feb3e Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 15 Jun 2007 18:13:39 +0000
Subject: [PATCH] Mostly aesthetical change.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21416 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/tools/rc/Jamfile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/tools/rc/Jamfile b/src/tools/rc/Jamfile
index adeb7991c8..84896c8c69 100644
--- a/src/tools/rc/Jamfile
+++ b/src/tools/rc/Jamfile
@@ -13,20 +13,21 @@ SubDirC++Flags -include $(r5Compatibility) ;
 BuildPlatformStaticLibrary <build>librdef.a :
 	compile.cpp decompile.cpp lexer.l parser.y rdef.cpp ;
 
-# these platforms do not need a second copy of the strl routines
-if $(HOST_PLATFORM) != darwin && $(HOST_PLATFORM) != linux && $(HOST_PLATFORM) != freebsd {
-STRLSRC = strlcpy.c strlcat.c ;
+# On BeOS incompatible platforms we implicitly link against libroot_build.so,
+# which does already include the strl*() routines.
+local strlSources ;
+if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+	strlSources = strlcpy.c strlcat.c ;
 }
 
 BuildPlatformMain <build>rc :
 	rc.cpp
 
 	# these two are needed for R5 only
-	$(STRLSRC)
+	$(strlSources)
 ;
 LinkAgainst <build>rc
 	: <build>librdef.a $(HOST_LIBSTDC++) $(HOST_LIBBE) $(HOST_LIBSUPC++) ;
 
-SEARCH on [ FGristFiles
-		strlcat.c strlcpy.c
-	] = [ FDirName $(HAIKU_TOP) src system libroot posix string ] ;
+SEARCH on [ FGristFiles $(strlSources) ]
+	= [ FDirName $(HAIKU_TOP) src system libroot posix string ] ;