diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2022-05-17 15:52:57 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2022-05-18 11:36:06 +0200 |
| commit | bf423121768ce08f20016292d0e71acbaac0e341 (patch) | |
| tree | b14371cdbf19a984a3aef67c3a318d1191d16572 | |
| parent | 89c498ccdae67ae817f8a141183b771948a817b9 (diff) | |
build: Split includes
| -rwxr-xr-x | wscript | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -277,7 +277,7 @@ class Item(object): asflags=self.substitute(bld, self.data["asflags"]), cppflags=self.substitute(bld, self.data["cppflags"]), features="asm_explicit_target asm c", - includes=bic.includes + self.substitute(bld, self.data["includes"]), + includes=bic.includes + self.get_values(bld, "includes"), source=[source], target=target, ) @@ -290,7 +290,7 @@ class Item(object): cflags=self.substitute(bld, self.data["cflags"]), cppflags=cppflags + self.substitute(bld, self.data["cppflags"]), features="c", - includes=bic.includes + self.substitute(bld, self.data["includes"]), + includes=bic.includes + self.get_values(bld, "includes"), rule="${CC} ${CFLAGS} ${CPPFLAGS} ${DEFINES_ST:DEFINES} ${CPPPATH_ST:INCPATHS} -c ${SRC[0]} -o ${TGT}", source=[source] + deps, target=target, @@ -304,7 +304,7 @@ class Item(object): cppflags=cppflags + self.substitute(bld, self.data["cppflags"]), cxxflags=self.substitute(bld, self.data["cxxflags"]), features="cxx", - includes=bic.includes + self.substitute(bld, self.data["includes"]), + includes=bic.includes + self.get_values(bld, "includes"), rule="${CXX} ${CXXFLAGS} ${CPPFLAGS} ${DEFINES_ST:DEFINES} ${CPPPATH_ST:INCPATHS} -c ${SRC[0]} -o ${TGT}", source=[source] + deps, target=target, @@ -584,7 +584,7 @@ class ObjectsItem(Item): cflags=self.substitute(bld, self.data["cflags"]), cppflags=self.substitute(bld, self.data["cppflags"]), cxxflags=self.substitute(bld, self.data["cxxflags"]), - includes=bic.includes + self.substitute(bld, self.data["includes"]), + includes=bic.includes + self.get_values(bld, "includes"), source=self.data["source"], target=self.uid, ) @@ -608,7 +608,7 @@ class BSPItem(Item): cflags=self.substitute(bld, self.data["cflags"]), cppflags=self.substitute(bld, self.data["cppflags"]), features="c cstlib", - includes=bic.includes + self.substitute(bld, self.data["includes"]), + includes=bic.includes + self.get_values(bld, "includes"), install_path="${BSP_LIBDIR}", source=self.data["source"], target="rtemsbsp", @@ -630,7 +630,7 @@ class LibraryItem(Item): cppflags=self.substitute(bld, self.data["cppflags"]), cxxflags=self.substitute(bld, self.data["cxxflags"]), features="c cxx cstlib", - includes=bic.includes + self.substitute(bld, self.data["includes"]), + includes=bic.includes + self.get_values(bld, "includes"), install_path=self.data["install-path"], source=self.data["source"], target=self.get(bld, "target"), @@ -658,7 +658,7 @@ class TestProgramItem(Item): cppflags=bld.env[self.cppflags] + self.substitute(bld, self.data["cppflags"]), cxxflags=self.substitute(bld, self.data["cxxflags"]), features=self.data["features"], - includes=bic.includes + self.substitute(bld, self.data["includes"]), + includes=bic.includes + self.get_values(bld, "includes"), install_path=None, ldflags=bic.ldflags + self.substitute(bld, self.data["ldflags"]), source=self.data["source"], |