Add includes, flags, std, cpp, cppLinkStdLib options

Author: blaugold

pkgs/native_toolchain_c/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.2.3
+
+- Added `includes` for specifying include directories.
+- Added `flags` for specifying arbitrary compiler flags.
+- Added `std` for specifying a language standard.
+- Added `cpp` for enabling C++ compilation.
+- Added `cppLinkStdLib` for specifying the C++ standard library to link against.
+
 ## 0.2.2
 
 - Generate position independent code for libraries by default and add

pkgs/native_toolchain_c/lib/src/cbuilder/cbuilder.dart

@@ -105,6 +105,33 @@ class CBuilder implements Builder {
   /// Defaults to `true` for libraries and `false` for executables.
   final bool? pic;
 
+  /// The language standard to use.
+  ///
+  /// When set to `null`, the default behavior of the compiler will be used.
+  final String? std;
+
+  /// Whether to compile sources as C++.
+  ///
+  /// [cppLinkStdLib] only has an effect when this is `true`.
+  final bool cpp;
+
+  /// The C++ standard library to link against.
+  ///
+  /// This option has no effect when [cpp] is `false` or when compiling for
+  /// Windows.
+  ///
+  /// When set to `null`, the following defaults will be used, based on the
+  /// target OS:
+  ///
+  /// | OS      | Library      |
+  /// | :------ | :----------- |
+  /// | Android | `c++_shared` |
+  /// | iOS     | `c++`        |
+  /// | Linux   | `stdc++`     |
+  /// | macOS   | `c++`        |
+  /// | Fuchsia | `c++`        |
+  final String? cppLinkStdLib;
+
   CBuilder.library({
     required this.name,
     required this.assetId,
@@ -117,6 +144,9 @@ class CBuilder implements Builder {
     this.buildModeDefine = true,
     this.ndebugDefine = true,
     this.pic = true,
+    this.std,
+    this.cpp = false,
+    this.cppLinkStdLib,
   }) : _type = _CBuilderType.library;
 
   CBuilder.executable({
@@ -129,6 +159,9 @@ class CBuilder implements Builder {
     this.buildModeDefine = true,
     this.ndebugDefine = true,
     bool? pie = false,
+    this.std,
+    this.cpp = false,
+    this.cppLinkStdLib,
   })  : _type = _CBuilderType.executable,
         assetId = null,
         installName = null,
@@ -185,6 +218,9 @@ class CBuilder implements Builder {
             'NDEBUG': null,
         },
         pic: pic,
+        std: std,
+        cpp: cpp,
+        cppLinkStdLib: cppLinkStdLib,
       );
       await task.run();
     }
@@ -207,11 +243,21 @@ class CBuilder implements Builder {
       }
     }
     if (!buildConfig.dryRun) {
-      buildOutput.dependencies.dependencies.addAll([
+      final includeFiles = await Stream.fromIterable(includes)
+          .asyncExpand(
+            (include) => Directory(include.toFilePath())
+                .list(recursive: true)
+                .where((entry) => entry is File)
+                .map((file) => file.uri),
+          )
+          .toList();
+
+      buildOutput.dependencies.dependencies.addAll({
+        // Note: We use a Set here to deduplicate the dependencies.
         ...sources,
-        ...includes,
+        ...includeFiles,
         ...dartBuildFiles,
-      ]);
+      });
     }
   }
 }

pkgs/native_toolchain_c/lib/src/cbuilder/run_cbuilder.dart

@@ -36,6 +36,9 @@ class RunCBuilder {
   final List<String> flags;
   final Map<String, String?> defines;
   final bool? pic;
+  final String? std;
+  final bool cpp;
+  final String? cppLinkStdLib;
 
   RunCBuilder({
     required this.buildConfig,
@@ -49,6 +52,9 @@ class RunCBuilder {
     this.flags = const [],
     this.defines = const {},
     this.pic,
+    this.std,
+    this.cpp = false,
+    this.cppLinkStdLib,
   })  : outDir = buildConfig.outDir,
         target = buildConfig.target,
         assert([executable, dynamicLibrary, staticLibrary]
@@ -137,21 +143,6 @@ class RunCBuilder {
           '-install_name',
           installName!.toFilePath(),
         ],
-        ...sources.map((e) => e.toFilePath()),
-        if (executable != null) ...[
-          '-o',
-          outDir.resolveUri(executable!).toFilePath(),
-        ],
-        if (dynamicLibrary != null) ...[
-          '--shared',
-          '-o',
-          outDir.resolveUri(dynamicLibrary!).toFilePath(),
-        ] else if (staticLibrary != null) ...[
-          '-c',
-          '-o',
-          outDir.resolve('out.o').toFilePath(),
-        ],
-        for (final include in includes) '-I${include.toFilePath()}',
         if (pic != null)
           if (pic!) ...[
             if (dynamicLibrary != null) '-fPIC',
@@ -166,9 +157,31 @@ class RunCBuilder {
             '-fno-PIC',
             '-fno-PIE',
           ],
+        if (std != null) '-std=$std',
+        if (cpp) ...[
+          '-x',
+          'c++',
+          '-l',
+          cppLinkStdLib ?? defaultCppLinkStdLib[target.os]!
+        ],
+        ...flags,
         for (final MapEntry(key: name, :value) in defines.entries)
           if (value == null) '-D$name' else '-D$name=$value',
-        ...flags,
+        for (final include in includes) '-I${include.toFilePath()}',
+        ...sources.map((e) => e.toFilePath()),
+        if (executable != null) ...[
+          '-o',
+          outDir.resolveUri(executable!).toFilePath(),
+        ],
+        if (dynamicLibrary != null) ...[
+          '--shared',
+          '-o',
+          outDir.resolveUri(dynamicLibrary!).toFilePath(),
+        ] else if (staticLibrary != null) ...[
+          '-c',
+          '-o',
+          outDir.resolve('out.o').toFilePath(),
+        ],
       ],
       logger: logger,
       captureOutput: false,
@@ -203,10 +216,12 @@ class RunCBuilder {
     final result = await runProcess(
       executable: compiler.uri,
       arguments: [
-        for (final include in includes) '/I${include.toFilePath()}',
+        if (std != null) '/std:$std',
+        if (cpp) '/TP',
+        ...flags,
         for (final MapEntry(key: name, :value) in defines.entries)
           if (value == null) '/D$name' else '/D$name=$value',
-        ...flags,
+        for (final include in includes) '/I${include.toFilePath()}',
         if (executable != null) ...[
           ...sources.map((e) => e.toFilePath()),
           '/link',
@@ -269,4 +284,12 @@ class RunCBuilder {
       IOSSdk.iPhoneSimulator: 'x86_64-apple-ios-simulator',
     },
   };
+
+  static const defaultCppLinkStdLib = {
+    OS.android: 'c++_shared',
+    OS.fuchsia: 'c++',
+    OS.iOS: 'c++',
+    OS.linux: 'stdc++',
+    OS.macOS: 'c++',
+  };
 }

pkgs/native_toolchain_c/pubspec.yaml

@@ -1,7 +1,7 @@
 name: native_toolchain_c
 description: >-
   A library to invoke the native C compiler installed on the host machine.
-version: 0.2.2
+version: 0.2.3
 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_toolchain_c
 
 topics: