diff options
| -rw-r--r-- | Makefile.rules | 4 | ||||
| -rw-r--r-- | util/build.mk | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.rules b/Makefile.rules index df8c047afd..f04fa4a15c 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -21,8 +21,8 @@ skip_boards = OWNERS host kevin gru boards := $(filter-out $(skip_boards),$(notdir $(wildcard board/* private*/board/*))) # Create output directories if necessary -_common_dir_create := $(foreach d,$(common_dirs),$(shell [ -d $(out)/$(d) ] || \ - mkdir -p $(out)/$(d))) +_common_dir_create := $(foreach d,$(common_dirs) $(common-dirs-y),\ + $(shell [ -d $(out)/$(d) ] || mkdir -p $(out)/$(d))) _sharedlib_dir_create := $(foreach d,$(dirs),$(shell \ [ -d $(out)/$(SHOBJLIB)/$(d) ] || mkdir -p $(out)/$(SHOBJLIB)/$(d))) _dir_create := $(foreach d,$(dirs) $(dirs-y),\ diff --git a/util/build.mk b/util/build.mk index 37f01e0341..9b9f44c814 100644 --- a/util/build.mk +++ b/util/build.mk @@ -22,6 +22,12 @@ ifeq ($(BOARD),nocturne_fp) build-util-bin+=ectool_servo endif +# If the util/ directory in the private repo is symlinked into util/private, +# we want to build host-side tools from it, too. +ifneq ("$(wildcard util/private/build.mk)","") +include util/private/build.mk +endif + comm-objs=$(util-lock-objs:%=lock/%) comm-host.o comm-dev.o comm-objs+=comm-lpc.o comm-i2c.o misc_util.o |