build: Replace WINTOOL with CYGWIN_WINTOOL Kconfig

so the correct value can be determinated by Kconfig system automatically

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2020-05-18 22:18:15 +08:00
committed by patacongo
parent 05ebb39998
commit bd656888f2
312 changed files with 469 additions and 713 deletions
+2 -2
View File
@@ -53,7 +53,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
INCLUDES += -I "$(TOPDIR)\sched"
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
INCLUDES += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
INCLUDES += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
@@ -104,7 +104,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
+1
View File
@@ -25,6 +25,7 @@ config LM32_TOOLCHAIN_GNUL
config LM32_TOOLCHAIN_GNUW
bool "Generic GNU toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
+3 -14
View File
@@ -49,13 +49,13 @@ endif
ifeq ($(filter y, \
$(CONFIG_LM32_TOOLCHAIN_GNUL) \
),y)
CONFIG_LM32_TOOLCHAIN ?= GNUL
CONFIG_LM32_TOOLCHAIN ?= GNU
endif
ifeq ($(filter y, \
$(CONFIG_LM32_TOOLCHAIN_GNUW) \
),y)
CONFIG_LM32_TOOLCHAIN ?= GNUW
CONFIG_LM32_TOOLCHAIN ?= GNU
endif
#
@@ -84,21 +84,10 @@ ifeq ($(CONFIG_LM32_TOOLCHAIN),BUILDROOT)
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU toolchain on macOS, Linux or any typical Posix system
# Generic GNU toolchain
ifeq ($(CONFIG_LM32_TOOLCHAIN),GNUL)
CROSSDEV ?= lm32-elf-
ARCROSSDEV ?= lm32-elf-
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU toolchain under Windows (native)
ifeq ($(CONFIG_LM32_TOOLCHAIN),GNUW)
CROSSDEV ?= lm32-elf--
ARCROSSDEV ?= lm32-elf--
MAXOPTIMIZATION ?= -Os
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
+1
View File
@@ -25,6 +25,7 @@ config MINERVA_TOOLCHAIN_GNUL
config MINERVA_TOOLCHAIN_GNUW
bool "Generic GNU toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)