From c8ff5b217cfe90e11295e0fd987d04188807e98a Mon Sep 17 00:00:00 2001 From: Michal Gorecki Date: Tue, 28 Jan 2025 11:25:12 +0100 Subject: [PATCH] newt: Append include dirs of non-sdk packages Now non-sdk packages can also use pkg.include_dirs field --- newt/builder/buildpackage.go | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/newt/builder/buildpackage.go b/newt/builder/buildpackage.go index 9513bceff4..5b2567e7cf 100644 --- a/newt/builder/buildpackage.go +++ b/newt/builder/buildpackage.go @@ -293,31 +293,31 @@ func (bpkg *BuildPackage) publicIncludeDirs(b *Builder) []string { addIncludeDir(&incls, bp+"/include/"+pkgBase+"/arch/"+bspPkg.Arch) } - if bpkg.rpkg.Lpkg.Type() == pkg.PACKAGE_TYPE_SDK { - incls = append(incls, bspPkg.BasePath()+"/include/bsp/") + settings := b.cfg.AllSettingsForLpkg(bpkg.rpkg.Lpkg) - sdkIncls := bpkg.findSdkIncludes() - incls = append(incls, sdkIncls...) + inclDirs, err := bpkg.rpkg.Lpkg.PkgY.GetValStringSlice( + "pkg.include_dirs", settings) + util.OneTimeWarningError(err) - settings := b.cfg.AllSettingsForLpkg(bpkg.rpkg.Lpkg) + for _, dir := range inclDirs { + repo, path, err := newtutil.ParsePackageString(dir) - inclDirs, err := bpkg.rpkg.Lpkg.PkgY.GetValStringSlice( - "pkg.include_dirs", settings) - util.OneTimeWarningError(err) + if err != nil { + util.OneTimeWarningError(err) + } - for _, dir := range inclDirs { - repo, path, err := newtutil.ParsePackageString(dir) + if repo != "" { + incls = append(incls, "repos/"+repo+"/"+path) + } else { + incls = append(incls, bp+"/"+dir) + } + } - if err != nil { - util.OneTimeWarningError(err) - } + if bpkg.rpkg.Lpkg.Type() == pkg.PACKAGE_TYPE_SDK { + incls = append(incls, bspPkg.BasePath()+"/include/bsp/") - if repo != "" { - incls = append(incls, "repos/"+repo+"/"+path) - } else { - incls = append(incls, bp+"/"+dir) - } - } + sdkIncls := bpkg.findSdkIncludes() + incls = append(incls, sdkIncls...) } return incls