i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added new optional parameter to AddSymlinkToHaikuHybridImage allowing to create

Browse Source 
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
This commit is contained in:
Ingo Weinhold
2009-06-21 10:57:01 +00:00
parent f6fcf9b832
commit e20c80b57f
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+13 -5
View File
@@ -1053,10 +1053,10 @@ rule AddFilesToHaikuHybridImage directory : targets : destName
} }
rule AddSymlinkToHaikuHybridImage directoryTokens : linkTarget : linkName rule AddSymlinkToHaikuHybridImage directoryTokens : linkTarget : linkName
: useSymlinkABISubDir : useSymlinkTargetABISubDir : useABISubDir
{ {
# AddFilesToHaikuHybridImage <directoryTokens> : <linkTarget> : <linkName> # AddFilesToHaikuHybridImage <directoryTokens> : <linkTarget> : <linkName>
# : <useSymlinkABISubDir> # [ : <useSymlinkTargetABISubDir> [ : <useABISubDir> ] ]
# #
# Convenience rule calling both AddSymlinkToHaikuImage and # Convenience rule calling both AddSymlinkToHaikuImage and
# AddSymlinkToAlternativeGCCArchive. # AddSymlinkToAlternativeGCCArchive.
@@ -1064,13 +1064,21 @@ rule AddSymlinkToHaikuHybridImage directoryTokens : linkTarget : linkName
# <linkTarget> # <linkTarget>
# Can be a list of components that will be joined to path inserting # Can be a list of components that will be joined to path inserting
# "/"s inbetween. # "/"s inbetween.
# <useSymlinkABISubDir> # <useSymlinkTargetABISubDir>
# If non-empty, specifies that an ABI subdirectory shall be inserted # If non-empty, specifies that an ABI subdirectory shall be inserted
# into <linkTarget> (between the first and second component) for the # into <linkTarget> (between the first and second component) for the
# alternative GCC archive. # 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) ; local alternativeLinkTarget = $(linkTarget) ;
if $(useSymlinkABISubDir) { if $(useSymlinkTargetABISubDir) {
alternativeLinkTarget = $(linkTarget[1]) gcc$(HAIKU_GCC_VERSION[1]) alternativeLinkTarget = $(linkTarget[1]) gcc$(HAIKU_GCC_VERSION[1])
$(linkTarget[2-]) ; $(linkTarget[2-]) ;
} }
@@ -1078,7 +1086,7 @@ rule AddSymlinkToHaikuHybridImage directoryTokens : linkTarget : linkName
alternativeLinkTarget = $(alternativeLinkTarget:J=/) ; alternativeLinkTarget = $(alternativeLinkTarget:J=/) ;
AddSymlinkToHaikuImage $(directoryTokens) : $(linkTarget) : $(linkName) ; AddSymlinkToHaikuImage $(directoryTokens) : $(linkTarget) : $(linkName) ;
AddSymlinkToAlternativeGCCArchive $(directoryTokens) AddSymlinkToAlternativeGCCArchive $(alternativeDirTokens)
: $(alternativeLinkTarget) : $(linkName) ; : $(alternativeLinkTarget) : $(linkName) ;
} }