ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tup: do not take local includes from pkg-config

This commit is contained in:
Ehmry - 2019-09-21 20:51:45 +02:00
parent 2d7dff54ec
commit d0865d365c
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
repos/os/Tupfile
View File

@ -1,21 +1,5 @@
include_rules
ifdef NIX_OUTPUTS_DEV
include_rules
SED_FLAGS += -e "s|@includedir@|@(NIX_OUTPUTS_DEV)/include/os|"
else
SED_FLAGS += -e "s|@includedir@|`nix-store --add $(REP_DIR)/include`|"
endif
ifeq (@(TUP_ARCH),i386)
SED_FLAGS += -e 's|@spec_includes@|-I${includedir}/spec/x86_32 -I${includedir}/spec/x86|'
endif
ifeq (@(TUP_ARCH),x86_64)
SED_FLAGS += -e 's|@spec_includes@|-I${includedir}/spec/x86_64 -I${includedir}/spec/x86|'
endif
ifeq (@(TUP_ARCH),arm)
SED_FLAGS += -e 's|@spec_includes@| -I${includedir}/spec/arm|'
endif
: *.pc.in |> !sed_pkgconfig_file |>
endif

17
repos/os/Tuprules.tup
View File

@ -1,2 +1,17 @@
REP_DIR = $(TUP_CWD)
LIBS += genode-os
ifeq (@(TUP_ARCH),i386)
INCLUDES += -I$(REP_DIR)/include/spec/x86_32
INCLUDES += -I$(REP_DIR)/include/spec/x86
endif
ifeq (@(TUP_ARCH),x86_64)
INCLUDES += -I$(REP_DIR)/include/spec/x86_64
INCLUDES += -I$(REP_DIR)/include/spec/x86
endif
ifeq (@(TUP_ARCH),arm)
INCLUDES += -I$(REP_DIR)/include/spec/arm
endif
INCLUDES += -I$(REP_DIR)/include