Fix some linker errors to do with C++ vs C compilation

bin/Cargo.toml

@@ -10,4 +10,4 @@ path = "wasmer.rs"
 [dependencies.wasmer-c-api]
 version = "2.0.0"
 default-features = false
-features = ["jit", "cranelift", "wasi"]
+features = ["jit", "cranelift", "wasi", "universal"]

bin/finalizers.cc → bin/finalizers.c

@@ -6,8 +6,8 @@
 #include "dart_api_dl.h"
 
 #define FINALIZER(type)                                                        \
-  extern "C" void wasm_##type##_delete(void *);                                \
-  extern "C" void wasm_##type##_finalizer(void *, void *native_object) {       \
+  void wasm_##type##_delete(void *native_object);                              \
+  void wasm_##type##_finalizer(void *unused, void *native_object) {            \
     wasm_##type##_delete(native_object);                                       \
   }                                                                            \
   DART_EXPORT void set_finalizer_for_##type(Dart_Handle dart_object,           \

bin/setup.dart

@@ -282,8 +282,8 @@ Future<void> _main(ArgResults args) async {
       '--release'
     ],
     environment: {
+      if (args['clang'] != null) 'CC': clang,
       if (args['clangpp'] != null) ...{
-        'CC': clangpp,
         'CXX': clangpp,
         'LINKER': clangpp,
         'CARGO_TARGET_${_toUpperUnderscore(target)}_LINKER': clangpp,
@@ -321,22 +321,20 @@ Future<void> _main(ArgResults args) async {
   ]);
 
   // Build finalizers.o.
-  await _run(clangpp, [
+  await _run(clang, [
     '-DDART_SHARED_LIB',
     '-DNDEBUG',
     '-fno-exceptions',
-    '-fno-rtti',
     if (os != 'windows') '-fPIC',
     '-O3',
-    '-std=c++11',
     '-target',
     target,
     '-I',
     sdkIncDir.toFilePath(),
     '-I',
     outDir.resolve('include/').toFilePath(),
     '-c',
-    srcDir.resolve('finalizers.cc').toFilePath(),
+    srcDir.resolve('finalizers.c').toFilePath(),
     '-o',
     outDir.resolve('finalizers.o').toFilePath()
   ]);