From d4ca483edc718c1305a76cb7c0c291300c99817d Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 30 Sep 2019 06:49:20 -0600 Subject: [PATCH] tools/Makefile.unix: Make COMMON_DIR work with CONFIG_ARCH_BOARD_CUSTOM. --- tools/Makefile.unix | 2 +- tools/Makefile.win | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.unix b/tools/Makefile.unix index fb87ec0811..e634653307 100644 --- a/tools/Makefile.unix +++ b/tools/Makefile.unix @@ -90,7 +90,7 @@ else BOARD_DIR = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP) endif -COMMON_DIR = $(if $(wildcard $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)/common/Makefile),y,) +COMMON_DIR = $(if $(wildcard $(BOARD_DIR)/common/Makefile),y,) # GIT directory present diff --git a/tools/Makefile.win b/tools/Makefile.win index afccb8b780..d8026b3818 100644 --- a/tools/Makefile.win +++ b/tools/Makefile.win @@ -76,7 +76,7 @@ else BOARD_DIR = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP) endif -COMMON_DIR = $(if $(wildcard $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)common$(DELIM)Makefile),y,) +COMMON_DIR = $(if $(wildcard $(BOARD_DIR)$(DELIM)common$(DELIM)Makefile),y,) # CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file. # The default value of CONFIG_APPS_DIR is ..\apps. Ultimately, the application