[kbuild] fix out of tree build problem with environment handling
This patch fixes the out of tree build, which was broken in
7b498d9838
.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
parent
b972a4531f
commit
b2e60b9eab
32
Makefile
32
Makefile
|
@ -4,22 +4,6 @@ SUBLEVEL = 0
|
|||
EXTRAVERSION =-rc5-git
|
||||
NAME = Amissive Actinocutious Kiwi
|
||||
|
||||
#
|
||||
# sanity checks for check default environemnt
|
||||
#
|
||||
ifdef CONFIG_DEFAULT_ENVIRONMENT
|
||||
|
||||
ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_PATH),"")
|
||||
$(error default environment path empty))
|
||||
endif
|
||||
|
||||
saved-env_path := $(CONFIG_DEFAULT_ENVIRONMENT_PATH)
|
||||
CONFIG_DEFAULT_ENVIRONMENT_PATH := $(shell cd $(CONFIG_DEFAULT_ENVIRONMENT_PATH) && /bin/pwd)
|
||||
$(if $(CONFIG_DEFAULT_ENVIRONMENT_PATH),, \
|
||||
$(error default environment path $(saved-env_path) does not exist))
|
||||
|
||||
endif # ifdef CONFIG_DEFAULT_ENVIRONMENT
|
||||
|
||||
# *DOCUMENTATION*
|
||||
# To see a list of typical targets execute "make help"
|
||||
# More info can be located in ./README
|
||||
|
@ -1245,3 +1229,19 @@ Makefile: ;
|
|||
# Declare the contents of the .PHONY variable as phony. We keep that
|
||||
# information in a variable se we can use it in if_changed and friends.
|
||||
.PHONY: $(PHONY)
|
||||
|
||||
#
|
||||
# sanity checks for check default environemnt
|
||||
#
|
||||
ifdef CONFIG_DEFAULT_ENVIRONMENT
|
||||
|
||||
ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_PATH),"")
|
||||
$(error default environment path empty))
|
||||
endif
|
||||
|
||||
saved-env_path := $(CONFIG_DEFAULT_ENVIRONMENT_PATH)
|
||||
CONFIG_DEFAULT_ENVIRONMENT_PATH := $(shell cd $(if $(filter /%,$(CONFIG_DEFAULT_ENVIRONMENT_PATH)),,$(srctree)/)$(CONFIG_DEFAULT_ENVIRONMENT_PATH) && /bin/pwd)
|
||||
$(if $(CONFIG_DEFAULT_ENVIRONMENT_PATH),, \
|
||||
$(error default environment path $(saved-env_path) does not exist))
|
||||
|
||||
endif # ifdef CONFIG_DEFAULT_ENVIRONMENT
|
||||
|
|
Loading…
Reference in New Issue