[native_assets_cli] Nest c_compiler config

Author: dcharkes

pkgs/c_compiler/lib/src/cbuilder/compiler_resolver.dart

@@ -33,8 +33,8 @@ class CompilerResolver {
   Future<ToolInstance> resolveCompiler() async {
     // First, check if the launcher provided a direct path to the compiler.
     var result = await _tryLoadCompilerFromConfig(
-      BuildConfig.ccConfigKey,
-      (buildConfig) => buildConfig.cc,
+      CCompilerConfig.ccConfigKeyFull,
+      (buildConfig) => buildConfig.cCompiler.cc,
     );
 
     // Then, try to detect on the host machine.
@@ -91,11 +91,12 @@ class CompilerResolver {
     if (configCcUri != null) {
       assert(await File.fromUri(configCcUri).exists());
       logger?.finer('Using compiler ${configCcUri.toFilePath()} '
-          'from config[${BuildConfig.ccConfigKey}].');
+          'from config[${CCompilerConfig.ccConfigKeyFull}].');
       return (await CompilerRecognizer(configCcUri).resolve(logger: logger))
           .first;
     }
-    logger?.finer('No compiler set in config[${BuildConfig.ccConfigKey}].');
+    logger?.finer(
+        'No compiler set in config[${CCompilerConfig.ccConfigKeyFull}].');
     return null;
   }
 
@@ -110,8 +111,8 @@ class CompilerResolver {
   Future<ToolInstance> resolveArchiver() async {
     // First, check if the launcher provided a direct path to the compiler.
     var result = await _tryLoadArchiverFromConfig(
-      BuildConfig.arConfigKey,
-      (buildConfig) => buildConfig.ar,
+      CCompilerConfig.arConfigKeyFull,
+      (buildConfig) => buildConfig.cCompiler.ar,
     );
 
     // Then, try to detect on the host machine.
@@ -167,16 +168,17 @@ class CompilerResolver {
     if (configArUri != null) {
       assert(await File.fromUri(configArUri).exists());
       logger?.finer('Using archiver ${configArUri.toFilePath()} '
-          'from config[${BuildConfig.arConfigKey}].');
+          'from config[${CCompilerConfig.arConfigKeyFull}].');
       return (await ArchiverRecognizer(configArUri).resolve(logger: logger))
           .first;
     }
-    logger?.finer('No archiver set in config[${BuildConfig.arConfigKey}].');
+    logger?.finer(
+        'No archiver set in config[${CCompilerConfig.arConfigKeyFull}].');
     return null;
   }
 
   Future<Uri?> toolchainEnvironmentScript(ToolInstance compiler) async {
-    final fromConfig = buildConfig.toolchainEnvScript;
+    final fromConfig = buildConfig.cCompiler.toolchainEnvScript;
     if (fromConfig != null) {
       logger?.fine('Using toolchainEnvScript from config: $fromConfig');
       return fromConfig;
@@ -190,7 +192,7 @@ class CompilerResolver {
   }
 
   List<String>? toolchainEnvironmentScriptArguments() {
-    final fromConfig = buildConfig.toolchainEnvScriptArgs;
+    final fromConfig = buildConfig.cCompiler.toolchainEnvScriptArgs;
     if (fromConfig != null) {
       logger?.fine('Using toolchainEnvScriptArgs from config: $fromConfig');
       return fromConfig;

pkgs/c_compiler/test/cbuilder/cbuilder_test.dart

@@ -29,11 +29,13 @@ void main() {
         outDir: tempUri,
         packageRoot: tempUri,
         target: Target.current,
-        linkModePreference:
-            LinkModePreference.dynamic, // Ignored by executables.
-        cc: cc,
-        toolchainEnvScript: toolchainEnvScript,
-        toolchainEnvScriptArgs: toolchainEnvScriptArgs,
+        // Ignored by executables.
+        linkModePreference: LinkModePreference.dynamic,
+        cCompiler: CCompilerConfig(
+          cc: cc,
+          toolchainEnvScript: toolchainEnvScript,
+          toolchainEnvScriptArgs: toolchainEnvScriptArgs,
+        ),
       );
       final buildOutput = BuildOutput();
       final cbuilder = CBuilder.executable(
@@ -72,9 +74,11 @@ void main() {
           packageRoot: tempUri,
           target: Target.current,
           linkModePreference: LinkModePreference.dynamic,
-          cc: cc,
-          toolchainEnvScript: toolchainEnvScript,
-          toolchainEnvScriptArgs: toolchainEnvScriptArgs,
+          cCompiler: CCompilerConfig(
+            cc: cc,
+            toolchainEnvScript: toolchainEnvScript,
+            toolchainEnvScriptArgs: toolchainEnvScriptArgs,
+          ),
         );
         final buildOutput = BuildOutput();
 

pkgs/c_compiler/test/cbuilder/compiler_resolver_test.dart

@@ -42,17 +42,19 @@ void main() {
         packageRoot: tempUri,
         target: Target.current,
         linkModePreference: LinkModePreference.dynamic,
-        ar: ar,
-        cc: cc,
-        ld: ld,
-        toolchainEnvScript: toolchainEnvScript,
+        cCompiler: CCompilerConfig(
+          ar: ar,
+          cc: cc,
+          ld: ld,
+          toolchainEnvScript: toolchainEnvScript,
+        ),
       );
       final resolver =
           CompilerResolver(buildConfig: buildConfig, logger: logger);
       final compiler = await resolver.resolveCompiler();
       final archiver = await resolver.resolveArchiver();
-      expect(compiler.uri, buildConfig.cc);
-      expect(archiver.uri, buildConfig.ar);
+      expect(compiler.uri, buildConfig.cCompiler.cc);
+      expect(archiver.uri, buildConfig.cCompiler.ar);
     });
   });