Skip to content

Commit

Permalink
build: Replace WINTOOL with CYGWIN_WINTOOL Kconfig
Browse files Browse the repository at this point in the history
so the correct value can be determinated by Kconfig system automatically

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
  • Loading branch information
xiaoxiang781216 authored and patacongo committed May 18, 2020
1 parent 0a6f978 commit d232823
Show file tree
Hide file tree
Showing 17 changed files with 22 additions and 27 deletions.
4 changes: 2 additions & 2 deletions Application.mk
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ $(CXXOBJS): %$(SUFFIX)$(OBJEXT): %$(CXXEXT)
$(call ELFCOMPILEXX, $<, $@), $(call COMPILEXX, $<, $@))

.built: $(OBJS)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
$(call ARLOCK, "${shell cygpath -w $(BIN)}", $(OBJS))
else
$(call ARLOCK, $(BIN), $(OBJS))
Expand All @@ -153,7 +153,7 @@ PROGOBJ := $(MAINOBJ)

$(PROGLIST): $(MAINOBJ)
$(Q) mkdir -p $(BINDIR)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
$(call ELFLD,$(firstword $(PROGOBJ)),"${shell cygpath -w $(firstword $(PROGLIST))}")
else
$(call ELFLD,$(firstword $(PROGOBJ)),$(firstword $(PROGLIST)))
Expand Down
6 changes: 3 additions & 3 deletions Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ else ifeq ($(CONFIG_WINDOWS_MSYS),y)
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
else
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
else
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)link.sh
Expand Down Expand Up @@ -146,7 +146,7 @@ else
MKKCONFIG = $(APPDIR)$(DELIM)tools$(DELIM)mkkconfig.sh
endif

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
INCDIROPT = -w
endif

Expand All @@ -155,7 +155,7 @@ endif
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}
CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDLIBS ?= "${shell cygpath -w $(BIN)}"
else
LDLIBS ?= $(BIN)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ $(SYMTABOBJ): %$(OBJEXT): %.c
$(call COMPILE, -fno-lto $<, $@)

$(BIN): $(SYMTABOBJ)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
$(call ARLOCK, "${shell cygpath -w $(BIN)}", $^)
else
$(call ARLOCK, $(BIN), $^)
Expand Down
7 changes: 1 addition & 6 deletions examples/audio_rttl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,7 @@ AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio

# Audio Example flags

ifeq ($(WINTOOL),y)
CXXFLAGS += -I "${shell cygpath -w $(AUDIODIR)}"
else
CXXFLAGS += -I $(AUDIODIR)
endif

CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(AUDIODIR)"}
CXXFLAGS += -D_POSIX

include $(APPDIR)/Application.mk
2 changes: 1 addition & 1 deletion examples/elf/tests/errno/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
2 changes: 1 addition & 1 deletion examples/elf/tests/hello/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
2 changes: 1 addition & 1 deletion examples/elf/tests/helloxx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
2 changes: 1 addition & 1 deletion examples/elf/tests/longjmp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
2 changes: 1 addition & 1 deletion examples/elf/tests/mutex/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
2 changes: 1 addition & 1 deletion examples/elf/tests/pthread/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
2 changes: 1 addition & 1 deletion examples/elf/tests/signal/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
2 changes: 1 addition & 1 deletion examples/elf/tests/struct/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ DELIM ?= /

CELFFLAGS += -I.

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
2 changes: 1 addition & 1 deletion examples/elf/tests/task/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
2 changes: 1 addition & 1 deletion examples/module/drivers/chardev/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
2 changes: 1 addition & 1 deletion examples/sotest/lib/modprint/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
2 changes: 1 addition & 1 deletion examples/sotest/lib/sotest/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
OBJEXT ?= .o
DELIM ?= /

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
Expand Down
6 changes: 3 additions & 3 deletions import/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ endif
# Tool related definitions
# Compiler

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
Expand Down Expand Up @@ -181,7 +181,7 @@ AFLAGS = $(CFLAGS) -D__ASSEMBLY__

# Linker

ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
LDLIBPATH = -L "${shell cygpath -w $(APPDIR)}" -L "${shell cygpath -w $(TOPDIR)$(DELIM)libs}"
else
Expand All @@ -203,7 +203,7 @@ endif
# ELF module definitions

LDELFFLAGS = -r -e _start -Bstatic
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/scripts/gnu-elf.ld
Expand Down

0 comments on commit d232823

Please sign in to comment.