[incubator-nuttx] branch master updated: Fix Cygwin build broken by commit 34b34e2d451

[pr...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5ffb1c6  Fix Cygwin build broken by commit 34b34e2d451
5ffb1c6 is described below

commit 5ffb1c6a0bbac438e3db22b29186bd8845d62f47
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Tue Sep 22 11:51:22 2020 -0600

    Fix Cygwin build broken by commit 34b34e2d451
    
    Commit 34b34e2d451 uses the full path to libapps.a and introduced the use of the Make notdir command.  That command breaks the Cygwin build because when a native Windows toolchain is used, the full path to libapps.a is a Windows-sytle path and the Make notdir command (like most other GNU Make commands) fails if it is passed a Windows-style path.  This commit replaces the Make notdir command with the Bash basename command which can handle Windows paths.
---
 tools/Config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/Config.mk b/tools/Config.mk
index c3eb030..b6a36c2 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -317,7 +317,7 @@ endef
 #   CONFIG_WINDOWS_NATIVE - Defined for a Windows native build
 
 define ARCHIVE_ADD
-	@echo "AR (add): $(notdir $1) $(2)"
+	@echo "AR (add): ${shell basename $(1)} $(2)"
 	$(Q) $(AR) $1 $(2)
 endef
 
@@ -325,7 +325,7 @@ endef
 # created from scratch
 
 define ARCHIVE
-	@echo "AR (create): $(notdir $1) $(2)"
+	@echo "AR (create): ${shell basename $(1)} $(2)"
 	$(Q) $(RM) $1
 	$(Q) $(AR) $1 $(2)
 endef