From b28ea19b9dc3d8d8d273cb5c0ad607ec985a4c42 Mon Sep 17 00:00:00 2001
From: Michal Gorecki <michal.gorecki@codecoup.pl>
Date: Tue, 16 Apr 2024 12:17:55 +0200
Subject: [PATCH] builder: Add private includes only to specific packages

Instead of adding private includes paths to every package
we should add them to the specific packages
---
 newt/builder/build.go        | 4 ++++
 newt/builder/buildpackage.go | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/newt/builder/build.go b/newt/builder/build.go
index b611df3af..287ef0b22 100644
--- a/newt/builder/build.go
+++ b/newt/builder/build.go
@@ -322,6 +322,10 @@ func (b *Builder) collectCompileEntriesBpkg(bpkg *BuildPackage) (
 		return nil, err
 	}
 
+	var privateIncCi toolchain.CompilerInfo
+	privateIncCi.Includes = bpkg.privateIncludeDirs(b)
+	c.AddInfo(&privateIncCi)
+
 	srcDirs := []string{}
 
 	if len(bpkg.SourceDirectories) > 0 {
diff --git a/newt/builder/buildpackage.go b/newt/builder/buildpackage.go
index 7bcd835d8..9513bceff 100644
--- a/newt/builder/buildpackage.go
+++ b/newt/builder/buildpackage.go
@@ -243,7 +243,7 @@ func (bpkg *BuildPackage) CompilerInfo(
 		return nil, err
 	}
 
-	ci.Includes = append(bpkg.privateIncludeDirs(b), includePaths...)
+	ci.Includes = append(ci.Includes, includePaths...)
 	bpkg.ci = ci
 
 	return bpkg.ci, nil