Skip to content

Commit 924e55c

Browse files
committed
build: fix CONFIG_LWIP usage
As reported in #2 CONFIG_LWIP in stub.mk wasn't properly implemented. This patch fixes CONFIG_LWIP flag and let us remove lwip from the build. This will lead to smaller images sizes and less compilation times. Signed-off-by: Joao Martins <[email protected]>
1 parent 1fcf4db commit 924e55c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

stub.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ MINIOS_OBJS0-y := \
146146
hypervisor.o \
147147
kernel.o \
148148
lock.o \
149-
lwip-arch.o \
150-
lwip-net.o \
151149
main.o \
152150
math.o \
153151
mm.o \
@@ -159,6 +157,7 @@ MINIOS_OBJS0-y := \
159157
sys.o \
160158
xencons_ring.o \
161159
xmalloc.o
160+
MINIOS_OBJS0-$(CONFIG_LWIP) += lwip-arch.o lwip-net.o
162161
MINIOS_OBJS0-$(CONFIG_XENBUS) += xenbus.o
163162
MINIOS_OBJS0-$(CONFIG_XENBUS) += xs.o
164163
MINIOS_OBJS0-$(CONFIG_BLKFRONT) += blkfront.o
@@ -169,6 +168,7 @@ MINIOS_OBJS0-$(CONFIG_FBFRONT) += fbfront.o
169168
MINIOS_OBJS0-$(CONFIG_PCIFRONT) += pcifront.o
170169
MINIOS_OBJS0-$(CONFIG_CONSFRONT) += xencons_bus.o
171170
MINIOS_OBJS0-$(CONFIG_NETFRONT) += netfront.o
171+
MINIOS_OPT_FLAGS-$(CONFIG_LWIP) += -DCONFIG_LWIP
172172
MINIOS_OPT_FLAGS-$(CONFIG_START_NETWORK) += -DCONFIG_START_NETWORK
173173
MINIOS_OPT_FLAGS-$(CONFIG_SPARSE_BSS) += -DCONFIG_SPARSE_BSS
174174
MINIOS_OPT_FLAGS-$(CONFIG_QEMU_XS_ARGS) += -DCONFIG_QEMU_XS_ARGS
@@ -387,6 +387,8 @@ distclean-lwip:
387387

388388
else
389389

390+
CINCLUDES += -isystem $(LWIP_ROOT)/include/lwip
391+
CINCLUDES += -isystem $(LWIP_ROOT)/include/lwip/ipv4
390392
MINIOS_LWIP_LIB :=
391393
MINIOS_LWIP_OBJS :=
392394

0 commit comments

Comments
 (0)