diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-09-02 10:50:14 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-12-22 16:09:45 +0100 |
| commit | 7bf1d5084f3206dc8c53618a3a6d1e3e9760f20f (patch) | |
| tree | 5ff1185226afdfe814c1f980102ec2d8e65e908d | |
| parent | 2d0d639bf1ebe5809fcf893831b8451b279158d4 (diff) | |
build: Substitute all includes
| -rwxr-xr-x | wscript | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -281,7 +281,7 @@ class Item(object): asflags=self.data["asflags"], cppflags=self.data["cppflags"], features="asm_explicit_target asm c", - includes=bic.includes + self.data["includes"], + includes=bic.includes + self.get_values(bld, "includes"), source=[source], target=target, ) @@ -294,7 +294,7 @@ class Item(object): cflags=self.data["cflags"], cppflags=cppflags + self.data["cppflags"], features="c", - includes=bic.includes + 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, @@ -308,7 +308,7 @@ class Item(object): cppflags=cppflags + self.data["cppflags"], cxxflags=self.data["cxxflags"], features="cxx", - includes=bic.includes + 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.data["cflags"], cppflags=self.data["cppflags"], cxxflags=self.data["cxxflags"], - includes=bic.includes + 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.data["cflags"], cppflags=self.data["cppflags"], features="c cstlib", - includes=bic.includes + 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.data["cppflags"], cxxflags=self.data["cxxflags"], features="c cxx cstlib", - includes=bic.includes + 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.data["cppflags"], cxxflags=self.data["cxxflags"], features=self.data["features"], - includes=bic.includes + self.data["includes"], + includes=bic.includes + self.get_values(bld, "includes"), install_path=None, ldflags=bic.ldflags + self.data["ldflags"], source=self.data["source"], |