From dd1c7478ef0973e20e5c945ea4871f30cf291a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Sch=C3=BCtt?= <felix@wasmer.io>
Date: Fri, 16 Sep 2022 13:13:19 +0200
Subject: [PATCH] Add root_dir to include paths

---
 .../examples/wasmer-capi-examples-runner/src/lib.rs  | 12 +++++++-----
 lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs  | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/c-api/examples/wasmer-capi-examples-runner/src/lib.rs b/lib/c-api/examples/wasmer-capi-examples-runner/src/lib.rs
index 4fa00a879..cf7cea24d 100644
--- a/lib/c-api/examples/wasmer-capi-examples-runner/src/lib.rs
+++ b/lib/c-api/examples/wasmer-capi-examples-runner/src/lib.rs
@@ -105,9 +105,7 @@ impl Config {
             println!("manifest dir = {manifest_dir}, wasmer root dir = {wasmer_base_dir}");
             config.wasmer_dir = wasmer_base_dir.clone() + "/package";
             if !std::path::Path::new(&config.wasmer_dir).exists() {
-                if !std::path::Path::new(&format!("{wasmer_base_dir}/target/release"))
-                    .exists()
-                {
+                if !std::path::Path::new(&format!("{wasmer_base_dir}/target/release")).exists() {
                     println!("running make build-capi...");
                     // run make build-capi
                     let mut cmd = std::process::Command::new("make");
@@ -160,13 +158,15 @@ fn find_wasmer_base_dir() -> String {
             .split("wasmer/lib/c-api")
             .next()
             .unwrap()
-            .to_string() + "wasmer";
+            .to_string()
+            + "wasmer";
     } else if wasmer_base_dir.contains("wasmer\\lib\\c-api") {
         wasmer_base_dir = wasmer_base_dir
             .split("wasmer\\lib\\c-api")
             .next()
             .unwrap()
-            .to_string() + "wasmer";
+            .to_string()
+            + "wasmer";
     }
 
     wasmer_base_dir
@@ -307,6 +307,8 @@ fn test_run() {
             } else if !config.wasmer_dir.is_empty() {
                 command.arg("-I");
                 command.arg(&format!("{}/include", config.wasmer_dir));
+                command.arg("-I");
+                command.arg(&config.root_dir);
             }
             if !config.ldflags.is_empty() {
                 for f in config.ldflags.split_whitespace() {
diff --git a/lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs b/lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs
index 1b12f16d0..fc1a5b434 100644
--- a/lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs
+++ b/lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs
@@ -40,9 +40,7 @@ impl Config {
             println!("manifest dir = {manifest_dir}, wasmer root dir = {wasmer_base_dir}");
             config.wasmer_dir = wasmer_base_dir.clone() + "/package";
             if !std::path::Path::new(&config.wasmer_dir).exists() {
-                if !std::path::Path::new(&format!("{wasmer_base_dir}/target/release"))
-                    .exists()
-                {
+                if !std::path::Path::new(&format!("{wasmer_base_dir}/target/release")).exists() {
                     println!("running make build-capi...");
                     // run make build-capi
                     let mut cmd = std::process::Command::new("make");
@@ -109,13 +107,15 @@ fn find_wasmer_base_dir() -> String {
             .split("wasmer/lib/c-api")
             .next()
             .unwrap()
-            .to_string() + "wasmer";
+            .to_string()
+            + "wasmer";
     } else if wasmer_base_dir.contains("wasmer\\lib\\c-api") {
         wasmer_base_dir = wasmer_base_dir
             .split("wasmer\\lib\\c-api")
             .next()
             .unwrap()
-            .to_string() + "wasmer";
+            .to_string()
+            + "wasmer";
     }
 
     wasmer_base_dir
@@ -331,6 +331,8 @@ fn test_ok() {
             } else if !config.wasmer_dir.is_empty() {
                 command.arg("-I");
                 command.arg(&format!("{}/include", config.wasmer_dir));
+                command.arg("-I");
+                command.arg(&config.root_dir);
             }
             if !config.ldflags.is_empty() {
                 for f in config.ldflags.split_whitespace() {