[build] Don't assume x64 host when setting up gcc toolchains.

rmacnak-google · rmacnak-google · commit 3888fe97e8e1 · 2024-04-11T20:03:12.000Z
Change-Id: Ie79c6e415ef287472c41597f6896ce1045e01fa7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/304361 Reviewed-by: Alexander Aprelev <aam@google.com>
diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
@@ -163,7 +163,7 @@ gcc_toolchain("clang_x86") {
 }
 
 gcc_toolchain("x86") {
-  prefix = ""
+  prefix = "i686-linux-gnu-"
   if (ia32_toolchain_prefix != "") {
     prefix = ia32_toolchain_prefix
   }
@@ -205,7 +205,7 @@ gcc_toolchain("clang_x64") {
 }
 
 gcc_toolchain("x64") {
-  prefix = ""
+  prefix = "x86_64-linux-gnu-"
   if (x64_toolchain_prefix != "") {
     prefix = x64_toolchain_prefix
   }

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ gcc_toolchain("clang_x86") {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`gcc_toolchain("x86") {`
`166`		`- prefix = ""`
	`166`	`+ prefix = "i686-linux-gnu-"`
`167`	`167`	`if (ia32_toolchain_prefix != "") {`
`168`	`168`	`prefix = ia32_toolchain_prefix`
`169`	`169`	`}`
`@@ -205,7 +205,7 @@ gcc_toolchain("clang_x64") {`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`gcc_toolchain("x64") {`
`208`		`- prefix = ""`
	`208`	`+ prefix = "x86_64-linux-gnu-"`
`209`	`209`	`if (x64_toolchain_prefix != "") {`
`210`	`210`	`prefix = x64_toolchain_prefix`
`211`	`211`	`}`