From e20c80b57f5603cc5b43c57b400309747ba46c44 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 21 Jun 2009 10:57:01 +0000
Subject: [PATCH] Added new optional parameter to AddSymlinkToHaikuHybridImage
 allowing to create the symlink in a subdirectory for the alternative gcc.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31149 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/ImageRules | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 7952068eea..04ed7494dc 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -1053,10 +1053,10 @@ rule AddFilesToHaikuHybridImage directory : targets : destName
 }
 
 rule AddSymlinkToHaikuHybridImage directoryTokens : linkTarget : linkName
-	: useSymlinkABISubDir
+	: useSymlinkTargetABISubDir : useABISubDir
 {
 	# AddFilesToHaikuHybridImage <directoryTokens> : <linkTarget> : <linkName>
-	#	: <useSymlinkABISubDir>
+	#	[ : <useSymlinkTargetABISubDir> [ :  <useABISubDir> ] ]
 	#
 	# Convenience rule calling both AddSymlinkToHaikuImage and
 	# AddSymlinkToAlternativeGCCArchive.
@@ -1064,13 +1064,21 @@ rule AddSymlinkToHaikuHybridImage directoryTokens : linkTarget : linkName
 	# <linkTarget>
 	#	Can be a list of components that will be joined to path inserting
 	#	"/"s inbetween.
-	# <useSymlinkABISubDir>
+	# <useSymlinkTargetABISubDir>
 	#	If non-empty, specifies that an ABI subdirectory shall be inserted
 	#	into <linkTarget> (between the first and second component) for the
 	#	alternative GCC archive.
+	# <useABISubDir>
+	#	If non-empty, specifies that an ABI subdirectory part shall be appended
+	#	to the directory tokens for the alternative GCC archive.
+
+	local alternativeDirTokens = $(directoryTokens) ;
+	if $(useABISubDir) {
+		alternativeDirTokens += gcc$(HAIKU_GCC_VERSION[1]) ;
+	}
 
 	local alternativeLinkTarget = $(linkTarget) ;
-	if $(useSymlinkABISubDir) {
+	if $(useSymlinkTargetABISubDir) {
 		alternativeLinkTarget = $(linkTarget[1]) gcc$(HAIKU_GCC_VERSION[1])
 			$(linkTarget[2-]) ;
 	}
@@ -1078,7 +1086,7 @@ rule AddSymlinkToHaikuHybridImage directoryTokens : linkTarget : linkName
 	alternativeLinkTarget = $(alternativeLinkTarget:J=/) ;
 
 	AddSymlinkToHaikuImage $(directoryTokens) : $(linkTarget) : $(linkName) ;
-	AddSymlinkToAlternativeGCCArchive $(directoryTokens)
+	AddSymlinkToAlternativeGCCArchive $(alternativeDirTokens)
 		: $(alternativeLinkTarget) : $(linkName) ;
 }