Setup Linux X64 toolchain for non-X64 hosts.

dart-lang · Oct 25, 2023 · 613f7fd · 613f7fd
1 parent 757f503
commit 613f7fd
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/pkgs/native_toolchain_c/lib/src/cbuilder/compiler_resolver.dart b/pkgs/native_toolchain_c/lib/src/cbuilder/compiler_resolver.dart
@@ -74,6 +74,8 @@ class CompilerResolver {
           return aarch64LinuxGnuGcc;
         case Architecture.ia32:
           return i686LinuxGnuGcc;
+        case Architecture.x64:
+          return x86_64LinuxGnuGcc;
       }
     }
 
@@ -158,6 +160,8 @@ class CompilerResolver {
           return aarch64LinuxGnuGccAr;
         case Architecture.ia32:
           return i686LinuxGnuGccAr;
+        case Architecture.x64:
+          return x86_64LinuxGnuGccAr;
       }
     }
     if (host.os == OS.windows) {

diff --git a/pkgs/native_toolchain_c/lib/src/native_toolchain/gcc.dart b/pkgs/native_toolchain_c/lib/src/native_toolchain/gcc.dart
@@ -29,6 +29,15 @@ final i686LinuxGnuGccAr = _gnuArchiver('i686-linux-gnu');
 /// [gnuLinker] with [Tool.defaultResolver] for [Architecture.ia32].
 final i686LinuxGnuLd = _gnuLinker('i686-linux-gnu');
 
+/// [gcc] with [Tool.defaultResolver] for [Architecture.x64].
+final x86_64LinuxGnuGcc = _gcc('x86_64-linux-gnu');
+
+/// [gnuArchiver] with [Tool.defaultResolver] for [Architecture.x64].
+final x86_64LinuxGnuGccAr = _gnuArchiver('x86_64-linux-gnu');
+
+/// [gnuLinker] with [Tool.defaultResolver] for [Architecture.x64].
+final x86_64LinuxGnuLd = _gnuLinker('x86_64-linux-gnu');
+
 /// [gcc] with [Tool.defaultResolver] for [Architecture.arm].
 final armLinuxGnueabihfGcc = _gcc('arm-linux-gnueabihf');
 

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_linux_host_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_linux_host_test.dart
@@ -24,7 +24,7 @@ void main() {
     Target.linuxArm,
     Target.linuxArm64,
     Target.linuxIA32,
-    Target.linuxX64
+    Target.linuxX64,
   ];
 
   const readElfMachine = {

diff --git a/pkgs/native_toolchain_c/test/native_toolchain/gcc_test.dart b/pkgs/native_toolchain_c/test/native_toolchain/gcc_test.dart
@@ -59,4 +59,10 @@ void main() {
     i686LinuxGnuGccAr,
     i686LinuxGnuLd,
   ]);
+
+  testToolSet('x86_64LinuxGnuGcc', [
+    x86_64LinuxGnuGcc,
+    x86_64LinuxGnuGccAr,
+    x86_64LinuxGnuLd,
+  ]);
 }
diff --git a/pkgs/native_toolchain_c/test/native_toolchain/recognizer_test.dart b/pkgs/native_toolchain_c/test/native_toolchain/recognizer_test.dart
@@ -39,6 +39,9 @@ void main() async {
     RecognizerTest(link, LinkerRecognizer.new),
     RecognizerTest(lld, LinkerRecognizer.new),
     RecognizerTest(llvmAr, ArchiverRecognizer.new),
+    RecognizerTest(x86_64LinuxGnuGcc, CompilerRecognizer.new),
+    RecognizerTest(x86_64LinuxGnuGccAr, ArchiverRecognizer.new),
+    RecognizerTest(x86_64LinuxGnuLd, LinkerRecognizer.new),
   ];
 
   for (final test in tests) {