Skip to content

Commit 20b240d

Browse files
BrandonThomasJonesARMJonathan Watson
authored andcommitted
fix(cc_import): Correct flag type for headerPath
Change-Id: I4efb1483e88ca14bb555c8d0b69848e458e16123
1 parent db74c36 commit 20b240d

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

core/import_cc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (m *ModuleImportCC) OutFiles() (files file.Paths) {
5858

5959
func (m *ModuleImportCC) FlagsOut() (flags flag.Flags) {
6060
headerPath := filepath.Join(backend.Get().BuildDir(), "gen", m.shortName())
61-
flags = append(flags, flag.FromIncludePath(headerPath, flag.Type(file.TypeLink|file.TypeShared)))
61+
flags = append(flags, flag.FromIncludePathOwned(headerPath, m, flag.TypeInclude))
6262
lut := flag.FlagParserTable{
6363
{
6464
PropertyName: "Defines",

gendiffer/tests/cc_import/flags/out/linux/build.ninja.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ default import_lib_a
8080
# Factory: github.com/ARM-software/bob-build/core.Main.func1.1
8181
# Defined: build.bp:redacted
8282

83-
m.shared_lib_target.cflags = -DFOO -I${g.bob.BuildDir}/gen/import_lib_a
83+
m.shared_lib_target.cflags = -DFOO
8484
m.shared_lib_target.cxxflags =
8585

8686
build ${g.bob.BuildDir}/target/objects/shared_lib/main.cpp.o: g.bob.cxx $

gendiffer/tests/cc_import/header_only/out/linux/build.ninja.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ default import_lib_b
9494
# Factory: github.com/ARM-software/bob-build/core.Main.func1.1
9595
# Defined: build.bp:redacted
9696

97-
m.shared_lib_target.cflags = -I${g.bob.BuildDir}/gen/import_lib_a
97+
m.shared_lib_target.cflags =
9898
m.shared_lib_target.cxxflags =
9999

100100
build ${g.bob.BuildDir}/target/objects/shared_lib/main.cpp.o: g.bob.cxx $

0 commit comments

Comments
 (0)