Revert "builder: Add private includes only to specific packages"

This reverts commit 0ce1291.
JuulLabs · May 17, 2024 · 2c083d3 · 2c083d3
1 parent 0307ed2
commit 2c083d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/newt/builder/build.go b/newt/builder/build.go
@@ -322,10 +322,6 @@ 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
@@ -243,7 +243,7 @@ func (bpkg *BuildPackage) CompilerInfo(
 		return nil, err
 	}
 
-	ci.Includes = append(ci.Includes, includePaths...)
+	ci.Includes = append(bpkg.privateIncludeDirs(b), includePaths...)
 	bpkg.ci = ci
 
 	return bpkg.ci, nil