diff --git a/repos/dde_rump/lib/mk/rump_base.inc b/repos/dde_rump/lib/mk/rump_base.inc index e47932eb3..4827fa586 100644 --- a/repos/dde_rump/lib/mk/rump_base.inc +++ b/repos/dde_rump/lib/mk/rump_base.inc @@ -27,7 +27,7 @@ SOURCE = $(addprefix $(REP_DIR)/src/lib/rump/,$(SRC_CC)) # BUILD_CMD = BUILD_CC=cc BUILD_AR=ar BUILD_NM=nm BUILD_OBJCOPY=objcopy \ AR=$(AR) NM=$(NM) OBJCOPY=$(OBJCOPY) CC_TARGET=$(shell basename $(CC)) \ - $(RUMP_CONTRIB_DIR)/buildrump.sh -k -V'MAKEVERBOSE=$(VERBOSE_LEVEL)' \ + $(RUMP_CONTRIB_DIR)/buildrump.sh -H -k -V'MAKEVERBOSE=$(VERBOSE_LEVEL)' \ -V'NOGCCERROR=1' $(RUMP_OPT) -V'RUMP_LOCKS_UP=yes' \ -s $(RUMP_SRC) -T $(RUMP_TOOLS) -o $(RUMP_OBJ) -d $(RUMP_BASE) \ -F"DBG=$(CC_OLEVEL) -g" diff --git a/repos/dde_rump/recipes/src/rump/content.mk b/repos/dde_rump/recipes/src/rump/content.mk index 0d4fdf6f1..2b9facd08 100644 --- a/repos/dde_rump/recipes/src/rump/content.mk +++ b/repos/dde_rump/recipes/src/rump/content.mk @@ -9,8 +9,11 @@ MIRROR_FROM_REP_DIR := $(LIB_MK) \ include/rump include/rump_fs \ include/util -MIRROR_FROM_PORT_DIR := $(addprefix src/lib/dde_rump/, brlib nblibs src) \ - $(shell cd $(PORT_DIR); find src/lib/dde_rump -maxdepth 1 -type f) +MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find src/lib/dde_rump -maxdepth 1 -type f; \ + for d in src/lib/dde_rump/brlib src/lib/dde_rump/nblibs \ + src/lib/dde_rump/src; do \ + find $$d -mindepth 1 -maxdepth 1 -not -name .git; \ + done) content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR)