fix: use absolute include path in gcc compiler

coffeeispower · Feb 22, 2024 · ccd601a · ccd601a
1 parent 4a6b4b5
commit ccd601a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/compiler.rs b/src/compiler.rs
@@ -17,6 +17,7 @@ pub trait Compiler {
     /// It may use the package info to modify the way the command is generated (e.g. with compiler flags or dependencies)
     fn compile_command(
         &self,
+        package_path: PathBuf,
         source_path: PathBuf,
         output_path: PathBuf,
         package_info: &manifest::Package,
@@ -30,6 +31,7 @@ pub trait Compiler {
     /// It may use the package info to modify the way the command is generated (e.g. with linker flags or dependencies)
     fn link_command(
         &self,
+        package_path: PathBuf,
         object_files: Vec<PathBuf>,
         output_path: PathBuf,
         package_info: &manifest::Package,

diff --git a/src/compiler/gcc.rs b/src/compiler/gcc.rs
@@ -7,6 +7,7 @@ pub struct GCC;
 impl Compiler for GCC {
     fn compile_command(
         &self,
+        package_path: PathBuf,
         source_path: PathBuf,
         output_path: PathBuf,
         package_info: &crate::manifest::Package,
@@ -17,12 +18,15 @@ impl Compiler for GCC {
         }
         command.arg(source_path).args(["-c", "-o"]).arg(output_path);
         command.args(&package_info.additional_compiler_flags);
-        command.arg(format!("-I{}", package_info.include_folder.display()));
+        let mut include_folder_absolute_path = package_path.clone();
+        include_folder_absolute_path.push(&package_info.include_folder);
+        command.arg(format!("-I{}", include_folder_absolute_path.display()));
         command
     }
 
     fn link_command(
         &self,
+        _package_path: PathBuf,
         object_files: Vec<PathBuf>,
         output_path: PathBuf,
         package_info: &crate::manifest::Package,

diff --git a/src/package/builder.rs b/src/package/builder.rs
@@ -200,7 +200,12 @@ impl PackageBuilder {
             create_parent_folder(&object_file_path)?;
             if file_needs_rebuild(&src, &object_file_path) {
                 let output = compiler
-                    .compile_command(src.clone(), object_file_path.clone(), self.package())
+                    .compile_command(
+                        self.package_path(),
+                        src.clone(),
+                        object_file_path.clone(),
+                        self.package(),
+                    )
                     .stdout(Stdio::inherit())
                     .stderr(Stdio::inherit())
                     .output()?;
@@ -228,7 +233,12 @@ impl PackageBuilder {
         self.create_output_folder()?;
         let package_output_path = self.output_path();
         let link_command_output = compiler
-            .link_command(object_files, package_output_path.clone(), self.package())
+            .link_command(
+                self.package_path(),
+                object_files,
+                package_output_path.clone(),
+                self.package(),
+            )
             .stdout(Stdio::inherit())
             .stderr(Stdio::inherit())
             .output()?;