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

vrahane · vrahane · commit 2c083d3224ab · 2024-05-17T15:16:19.000-07:00
This reverts commit 0ce1291.
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

Original file line number	Diff line number	Diff line change
`@@ -322,10 +322,6 @@ func (b Builder) collectCompileEntriesBpkg(bpkg BuildPackage) (`
`322`	`322`	`return nil, err`
`323`	`323`	`}`
`324`	`324`
`325`		`- var privateIncCi toolchain.CompilerInfo`
`326`		`- privateIncCi.Includes = bpkg.privateIncludeDirs(b)`
`327`		`- c.AddInfo(&privateIncCi)`
`328`		`-`
`329`	`325`	`srcDirs := []string{}`
`330`	`326`
`331`	`327`	`if len(bpkg.SourceDirectories) > 0 {`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ func (bpkg *BuildPackage) CompilerInfo(`
`243`	`243`	`return nil, err`
`244`	`244`	`}`
`245`	`245`
`246`		`- ci.Includes = append(ci.Includes, includePaths...)`
	`246`	`+ ci.Includes = append(bpkg.privateIncludeDirs(b), includePaths...)`
`247`	`247`	`bpkg.ci = ci`
`248`	`248`
`249`	`249`	`return bpkg.ci, nil`