[incubator-nuttx] branch master updated: ez80: Fix ez80 build problems.

[ac...@apache.org]

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

acassis 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 0da3400  ez80:  Fix ez80 build problems.
0da3400 is described below

commit 0da34000093c6b7b6d392fd3384f95f9175aca8f
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Tue Jun 2 09:17:40 2020 -0600

    ez80:  Fix ez80 build problems.
    
    arch/z80/src/Makefile:  Correct inclusion of non-existent file.  This was not a problem before because there was '-' before the include.  Problem revealed with '-' removed.
    
    arch/z80/src/ez80/Toolchain.defs:  Apparently there are not too many '"' in path definition.
    
    tools/incdir.c:  No space between -usrinc:  or -sysinc:  and the list of paths.
---
 arch/z80/src/Makefile            | 1 -
 arch/z80/src/ez80/Toolchain.defs | 2 +-
 tools/incdir.c                   | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/arch/z80/src/Makefile b/arch/z80/src/Makefile
index 41e36ac..883b612 100644
--- a/arch/z80/src/Makefile
+++ b/arch/z80/src/Makefile
@@ -37,7 +37,6 @@
 
 include $(TOPDIR)/Make.defs
 include chip/Make.defs
-include board/Make.defs
 
 # Compiler-Dependent Make:  SDCC or ZiLOG ZDS-II
 
diff --git a/arch/z80/src/ez80/Toolchain.defs b/arch/z80/src/ez80/Toolchain.defs
index c40fa45..6a5b485 100644
--- a/arch/z80/src/ez80/Toolchain.defs
+++ b/arch/z80/src/ez80/Toolchain.defs
@@ -71,7 +71,7 @@ else
 
   # Escaped versions
 
-  ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
+  ETOPDIR := ${shell echo $(WTOPDIR) | sed -e "s/ /%20/g"}
   EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
   EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
 endif
diff --git a/tools/incdir.c b/tools/incdir.c
index d625506..3737a0f 100644
--- a/tools/incdir.c
+++ b/tools/incdir.c
@@ -399,8 +399,8 @@ int main(int argc, char **argv, char **envp)
 
       if (compiler == COMPILER_ZDSII)
         {
-          /* FORM:  -stdinc: 'dir1;dir2;...;dirN'
-           *        -usrinc: 'dir1;dir2;...;dirN'
+          /* FORM:  -stdinc:'dir1;dir2;...;dirN'
+           *        -usrinc:'dir1;dir2;...;dirN'
            */
 
           /* Treat the first directory differently */
@@ -409,11 +409,11 @@ int main(int argc, char **argv, char **envp)
             {
               if (i == ndirs - 1)
                 {
-                  ret = my_asprintf(&segment, "%s '%s'", cmdarg, incpath);
+                  ret = my_asprintf(&segment, "%s'%s'", cmdarg, incpath);
                 }
               else
                 {
-                  ret = my_asprintf(&segment, "%s '%s", cmdarg, incpath);
+                  ret = my_asprintf(&segment, "%s'%s", cmdarg, incpath);
                 }
             }
           else