Stop emitting duplicate symbols for armv7-linux-androideabi

dcsommer · dcsommer · commit 1aa071c9d92c · 2022-01-27T12:02:40.000-08:00
The change in 186517b was intended to affect only `arm-linux-androideabi` but also affected `armv7-linux-androideabi` which is not a pre-ARMv6 architecture. Fixes rust-lang#449
diff --git a/build.rs b/build.rs
@@ -83,7 +83,7 @@ fn main() {
     // rustc target (arm-linux-androideabi).
     if llvm_target[0] == "armv4t"
         || llvm_target[0] == "armv5te"
-        || llvm_target.get(2) == Some(&"androideabi")
+        || target == "arm-linux-androideabi"
     {
         println!("cargo:rustc-cfg=kernel_user_helpers")
     }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ fn main() {`
`83`	`83`	`// rustc target (arm-linux-androideabi).`
`84`	`84`	`if llvm_target[0] == "armv4t"`
`85`	`85`	`\|\| llvm_target[0] == "armv5te"`
`86`		`- \|\| llvm_target.get(2) == Some(&"androideabi")`
	`86`	`+ \|\| target == "arm-linux-androideabi"`
`87`	`87`	`{`
`88`	`88`	`println!("cargo:rustc-cfg=kernel_user_helpers")`
`89`	`89`	`}`