build/jam: Inline HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR where possible.

The "exec" tool can only handle one command with environs set at
the beginning of the line, so now we set the ADD_BUILD_COMPAT...
in this format. This also seems to be a general performance
improvement to builds using real shells, too.

Change-Id: If4b3117651b5475039d5e8116cd3de398582290a
This commit is contained in:
Augustin Cavalier
2019-08-30 17:11:50 -04:00
parent 12eb0e5d89
commit 128781e740
16 changed files with 51 additions and 49 deletions
+5 -5
View File
@@ -10,7 +10,7 @@ rule Copy
actions Copy1
{
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
"$(2[1])" -d "$(2[2-])" "$(1)"
}
@@ -295,7 +295,7 @@ actions ExtractTarArchive1
actions ExtractHPKGArchive1
{
mkdir -p "$(1)"
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) extract -C "$(1)" "$(2[2])"
}
@@ -355,7 +355,7 @@ rule CopySetHaikuRevision target : source
actions CopySetHaikuRevision1
{
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(2[1]) --data $(2[3]) $(1) || exit 1
@@ -422,7 +422,7 @@ rule DataFileToSourceFile sourceFile : dataFile : dataVariable : sizeVariable
actions DataFileToSourceFile1
{
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) $(DATA_VARIABLE) $(SIZE_VARIABLE) $(2[2]) $(1)
}
@@ -594,7 +594,7 @@ rule StripFile target : source
actions StripFile1
{
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
"$(STRIP)" -o "$(1)" "$(2[1])"
"$(2[2])" -o "$(1)" "$(2[1])"
"$(2[3])" "$(2[1])" "$(1)"