diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-26 15:06:50 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-26 15:06:50 +0000 |
commit | 582b39047e192bf28c568fc53fcff168c8293841 (patch) | |
tree | 237ee27237a2933afa2e945fb703db576b867640 /nuttx/configs/ez80f910200kitg | |
parent | a9de389d80485f8f305c7161e1312ef9a450892a (diff) | |
download | px4-nuttx-582b39047e192bf28c568fc53fcff168c8293841.tar.gz px4-nuttx-582b39047e192bf28c568fc53fcff168c8293841.tar.bz2 px4-nuttx-582b39047e192bf28c568fc53fcff168c8293841.zip |
Misc build fixes, some from Mike some for ez80 native build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5389 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/ez80f910200kitg')
-rw-r--r-- | nuttx/configs/ez80f910200kitg/ostest/Make.defs | 26 | ||||
-rwxr-xr-x | nuttx/configs/ez80f910200kitg/ostest/setenv.sh | 7 |
2 files changed, 13 insertions, 20 deletions
diff --git a/nuttx/configs/ez80f910200kitg/ostest/Make.defs b/nuttx/configs/ez80f910200kitg/ostest/Make.defs index 9f787ef1b..607a5adb7 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/Make.defs +++ b/nuttx/configs/ez80f910200kitg/ostest/Make.defs @@ -33,8 +33,8 @@ # ############################################################################ -include ${TOPDIR}/.config -include ${TOPDIR}/tools/Config.mk +include $(TOPDIR)/.config +include $(TOPDIR)/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed @@ -140,21 +140,11 @@ LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)configs$(DELIM)ez80f910200kitg$(DELIM)ostest$ # Tool names/pathes CROSSDEV = +CC = ez80cc.exe CPP = gcc -E - -ifeq ($(CONFIG_WINDOWS_NATIVE),y) - # PATH varialble should be set - CC = ez80cc.exe - LD = ez80link.exe - AS = ez80asm.exe - AR = ez80lib.exe -else - # Cygwin PATH variable is not sufficient - CC = "$(ZDSBINDIR)$(DELIM)ez80cc.exe" - LD = "$(ZDSBINDIR)$(DELIM)ez80link.exe" - AS = "$(ZDSBINDIR)$(DELIM)ez80asm.exe" - AR = "$(ZDSBINDIR)$(DELIM)ez80lib.exe" -endif +LD = ez80link.exe +AS = ez80asm.exe +AR = ez80lib.exe # File extensions @@ -205,11 +195,11 @@ define PREPROCESS endef define COMPILE - $(Q) "$(CC)" $(CFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE - $(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef define ARCHIVE diff --git a/nuttx/configs/ez80f910200kitg/ostest/setenv.sh b/nuttx/configs/ez80f910200kitg/ostest/setenv.sh index ce3ea8b53..42003ccb6 100755 --- a/nuttx/configs/ez80f910200kitg/ostest/setenv.sh +++ b/nuttx/configs/ez80f910200kitg/ostest/setenv.sh @@ -54,7 +54,10 @@ fi TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1\bin" # -# Add the path to the toolchain to the PATH varialble +# Add the path to the toolchain to the PATH varialble. NOTE that /bin and /usr/bin +# preceded the toolchain bin directory. This is because the ZDSII bin directory +# includes binaries like make.exe that will interfere with the normal build process +# if we do not give priority to the versions at /bin and /usr/bin. # -export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" +export PATH="/bin:/usr/bin:${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" |