This is an automated email from the ASF dual-hosted git repository. gnutt 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 9be0be5 build: host executable should use HOSTEXEEXT not EXEEXT 9be0be5 is described below commit 9be0be5d4756327fbc0ee6ffaec21f00e8a85683 Author: Xiang Xiao <xiaoxi...@xiaomi.com> AuthorDate: Tue May 19 21:56:39 2020 +0800 build: host executable should use HOSTEXEEXT not EXEEXT Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com> --- examples/cromfs/Makefile | 2 +- examples/elf/tests/Makefile | 2 +- examples/flowc/Makefile | 4 ++-- examples/module/drivers/Makefile | 2 +- examples/nettest/Makefile | 4 ++-- examples/tcpblaster/Makefile | 4 ++-- examples/udp/Makefile | 4 ++-- examples/usbserial/Makefile.host | 2 +- system/zmodem/Makefile.host | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/cromfs/Makefile b/examples/cromfs/Makefile index e4db1c2..fb3a192 100644 --- a/examples/cromfs/Makefile +++ b/examples/cromfs/Makefile @@ -41,7 +41,7 @@ CSRCS = cromfs.c NXTOOLDIR = $(TOPDIR)/tools GENCROMFSSRC = gencromfs.c -GENCROMFSEXE = gencromfs$(EXEEXT) +GENCROMFSEXE = gencromfs$(HOSTEXEEXT) # Build targets diff --git a/examples/elf/tests/Makefile b/examples/elf/tests/Makefile index 16be29b..4a3e673 100644 --- a/examples/elf/tests/Makefile +++ b/examples/elf/tests/Makefile @@ -67,7 +67,7 @@ ifeq ($(CONFIG_EXAMPLES_ELF_ROMFS),y) else NXTOOLDIR = $(TOPDIR)/tools GENCROMFSSRC = gencromfs.c - GENCROMFSEXE = gencromfs$(EXEEXT) + GENCROMFSEXE = gencromfs$(HOSTEXEEXT) FSIMG_SUBDIR = cromfs FSIMG_DIR = $(TESTS_DIR)/$(FSIMG_SUBDIR) diff --git a/examples/flowc/Makefile b/examples/flowc/Makefile index f457d62..a787e1b 100644 --- a/examples/flowc/Makefile +++ b/examples/flowc/Makefile @@ -77,10 +77,10 @@ HOSTOBJSEXT ?= hobj HOST_SRCS = flowc_host.c ifeq ($(CONFIG_EXAMPLES_FLOWC_SENDER1),y) HOST_SRCS += flowc_receiver.c -HOST_BIN = receiver$(EXEEXT) +HOST_BIN = receiver$(HOSTEXEEXT) else HOST_SRCS += flowc_sender.c -HOST_BIN = sender$(EXEEXT) +HOST_BIN = sender$(HOSTEXEEXT) endif HOST_OBJS = $(HOST_SRCS:.c=.$(HOSTOBJSEXT)) diff --git a/examples/module/drivers/Makefile b/examples/module/drivers/Makefile index 0d20549..b76f7e4 100644 --- a/examples/module/drivers/Makefile +++ b/examples/module/drivers/Makefile @@ -55,7 +55,7 @@ ifeq ($(CONFIG_EXAMPLES_MODULE_ROMFS),y) else ifeq ($(CONFIG_EXAMPLES_MODULE_CROMFS),y) NXTOOLDIR = $(TOPDIR)/tools GENCROMFSSRC = gencromfs.c - GENCROMFSEXE = gencromfs$(EXEEXT) + GENCROMFSEXE = gencromfs$(HOSTEXEEXT) FSIMG_SRC = $(DRIVER_DIR)/cromfs.c endif diff --git a/examples/nettest/Makefile b/examples/nettest/Makefile index c13a5d7..ae9862c 100644 --- a/examples/nettest/Makefile +++ b/examples/nettest/Makefile @@ -94,10 +94,10 @@ ifneq ($(CONFIG_EXAMPLES_NETTEST_LOOPBACK),y) HOST_SRCS = nettest_host.c ifeq ($(CONFIG_EXAMPLES_NETTEST_SERVER),y) HOST_SRCS += nettest_client.c - HOST_BIN = tcpclient$(EXEEXT) + HOST_BIN = tcpclient$(HOSTEXEEXT) else HOST_SRCS += nettest_server.c - HOST_BIN = tcpserver$(EXEEXT) + HOST_BIN = tcpserver$(HOSTEXEEXT) endif HOSTOBJEXT ?= hobj diff --git a/examples/tcpblaster/Makefile b/examples/tcpblaster/Makefile index fe09cbc..a58c5e6 100644 --- a/examples/tcpblaster/Makefile +++ b/examples/tcpblaster/Makefile @@ -91,10 +91,10 @@ ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK),y) HOST_SRCS = tcpblaster_host.c tcpblaster_cmdline.c ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER),y) HOST_SRCS += tcpblaster_client.c - HOST_BIN = tcpclient$(EXEEXT) + HOST_BIN = tcpclient$(HOSTEXEEXT) else HOST_SRCS += tcpblaster_server.c - HOST_BIN = tcpserver$(EXEEXT) + HOST_BIN = tcpserver$(HOSTEXEEXT) endif HOSTOBJEXT ?= hobj diff --git a/examples/udp/Makefile b/examples/udp/Makefile index dabd9c2..350b1a4 100644 --- a/examples/udp/Makefile +++ b/examples/udp/Makefile @@ -82,10 +82,10 @@ HOSTOBJSEXT ?= hobj HOST_SRCS = udp_host.c udp_cmdline.c ifeq ($(CONFIG_EXAMPLES_UDP_SERVER1),y) HOST_SRCS += udp_client.c -HOST_BIN = udpclient$(EXEEXT) +HOST_BIN = udpclient$(HOSTEXEEXT) else HOST_SRCS += udp_server.c -HOST_BIN = udpserver$(EXEEXT) +HOST_BIN = udpserver$(HOSTEXEEXT) endif HOST_OBJS = $(HOST_SRCS:.c=.$(HOSTOBJSEXT)) diff --git a/examples/usbserial/Makefile.host b/examples/usbserial/Makefile.host index 6abf779..e29c317 100644 --- a/examples/usbserial/Makefile.host +++ b/examples/usbserial/Makefile.host @@ -38,7 +38,7 @@ -include $(TOPDIR)/Make.defs SRC = host.c -BIN = host$(EXEEXT) +BIN = host$(HOSTEXEEXT) DEFINES = ifeq ($(CONFIG_EXAMPLES_USBSERIAL_INONLY),y) diff --git a/system/zmodem/Makefile.host b/system/zmodem/Makefile.host index 6e870ee..3565ac7 100644 --- a/system/zmodem/Makefile.host +++ b/system/zmodem/Makefile.host @@ -78,8 +78,8 @@ RZOBJS = $(RZSRCS:.c=$(OBJEXT)) CMNOBJS = $(CMNSRCS:.c=$(OBJEXT)) OBJS = $(SRCS:.c=$(OBJEXT)) -RZBIN = rz$(EXEEXT) -SZBIN = sz$(EXEEXT) +RZBIN = rz$(HOSTEXEEXT) +SZBIN = sz$(HOSTEXEEXT) VPATH = host