summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/soong/files/soong-gentoo-toolchain.patch')
-rw-r--r--dev-util/soong/files/soong-gentoo-toolchain.patch16
1 files changed, 10 insertions, 6 deletions
diff --git a/dev-util/soong/files/soong-gentoo-toolchain.patch b/dev-util/soong/files/soong-gentoo-toolchain.patch
index f9f1a7c..7a7c179 100644
--- a/dev-util/soong/files/soong-gentoo-toolchain.patch
+++ b/dev-util/soong/files/soong-gentoo-toolchain.patch
@@ -41,7 +41,11 @@ Index: soong-9999/build/soong/cc/builder.go
Rspfile: "${out}.rsp",
RspfileContent: "${in}",
},
-@@ -101,14 +96,11 @@ var (
+@@ -97,18 +92,14 @@ var (
+ prefixSymbols = pctx.AndroidStaticRule("prefixSymbols",
+ blueprint.RuleParams{
+ Command: "$objcopyCmd --prefix-symbols=${prefix} ${in} ${out}",
+- CommandDeps: []string{"$objcopyCmd"},
},
"objcopyCmd", "prefix")
@@ -57,7 +61,7 @@ Index: soong-9999/build/soong/cc/builder.go
},
"args", "crossCompile")
-@@ -124,7 +116,7 @@ var (
+@@ -124,7 +115,7 @@ var (
Depfile: "${out}.d",
Deps: blueprint.DepsGCC,
Command: "$copyGccLibPath $out $ccCmd $cFlags -print-file-name=${libName}",
@@ -66,7 +70,7 @@ Index: soong-9999/build/soong/cc/builder.go
},
"ccCmd", "cFlags", "libName")
-@@ -385,7 +377,6 @@ func TransformSourceToObj(ctx android.Mo
+@@ -385,7 +376,6 @@ func TransformSourceToObj(ctx android.Mo
ccDesc := ccCmd
if flags.clang {
@@ -74,7 +78,7 @@ Index: soong-9999/build/soong/cc/builder.go
} else {
ccCmd = gccCmd(flags.toolchain, ccCmd)
}
-@@ -568,7 +559,7 @@ func TransformObjToDynamicBinary(ctx and
+@@ -568,7 +558,7 @@ func TransformObjToDynamicBinary(ctx and
var ldCmd string
if flags.clang {
@@ -83,7 +87,7 @@ Index: soong-9999/build/soong/cc/builder.go
} else {
ldCmd = gccCmd(flags.toolchain, "g++")
}
-@@ -714,7 +705,7 @@ func TransformObjsToObj(ctx android.Modu
+@@ -714,7 +704,7 @@ func TransformObjsToObj(ctx android.Modu
var ldCmd string
if flags.clang {
@@ -92,7 +96,7 @@ Index: soong-9999/build/soong/cc/builder.go
} else {
ldCmd = gccCmd(flags.toolchain, "g++")
}
-@@ -817,7 +808,7 @@ func CopyGccLib(ctx android.ModuleContex
+@@ -817,7 +807,7 @@ func CopyGccLib(ctx android.ModuleContex
}
func gccCmd(toolchain config.Toolchain, cmd string) string {