Skip to content

Commit

Permalink
build(bugfix):tools/Make.defs reads the APPS DIR relative path and co…
Browse files Browse the repository at this point in the history
…rrects it to an absolute path

The location of calling tools/Make.defs is no longer under TOPDIR.
When CONFIG_APPS_DIR is set to a relative path.
APPS's Make.defs will not be correctly imported.

We correct the relative path to the absolute path of TOPDIR
  • Loading branch information
xuxin930 authored and xiaoxiang781216 committed Dec 25, 2024
1 parent 63d3786 commit 85c913d
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tools/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
ifeq ($(CONFIG_APPS_DIR),)
CONFIG_APPS_DIR = $(TOPDIR)/../apps
endif
ifneq ($(firstword $(CONFIG_APPS_DIR)),/)
CONFIG_APPS_DIR := $(TOPDIR)/$(CONFIG_APPS_DIR)
endif
APPDIR := $(realpath ${shell if [ -r $(CONFIG_APPS_DIR)/Makefile ]; then echo "$(CONFIG_APPS_DIR)"; fi})

ifeq ($(APPDIR),)
Expand Down

0 comments on commit 85c913d

Please sign in to comment.