You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/10/04 19:13:45 UTC

[incubator-nuttx-apps] branch master updated: make export: Fix make export for CONFIG_BUILD_KERNEL=y

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new 8c1c0efab make export: Fix make export for CONFIG_BUILD_KERNEL=y
8c1c0efab is described below

commit 8c1c0efabc7bb427b4ac04dbf10f695bbc47a575
Author: Ville Juven <vi...@unikie.com>
AuthorDate: Tue Oct 4 09:07:53 2022 +0300

    make export: Fix make export for CONFIG_BUILD_KERNEL=y
    
    The condition:
    [ -f "$${f}" ] && cp -f "$${f}" "${EXPORTDIR}"$(DELIM)registry ;
    
    Fails if the first part of the condition returns empty / false, stopping
    make for no reason due to the error.
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e6ddb1633..beae68005 100644
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,9 @@ ifneq ($(EXPORTDIR),)
 ifneq ($(CONFIG_BUILD_KERNEL),y)
 ifneq ($(BUILTIN_REGISTRY),)
 	for f in "${BUILTIN_REGISTRY}"$(DELIM)*.bdat "${BUILTIN_REGISTRY}"$(DELIM)*.pdat ; do \
-		[ -f "$${f}" ] && cp -f "$${f}" "${EXPORTDIR}"$(DELIM)registry ; \
+		if [ -f "$${f}" ]; then \
+			cp -f "$${f}" "${EXPORTDIR}"$(DELIM)registry ; \
+		fi \
 	done
 endif
 endif