sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/Make.defs: Fix an error introduced with recent chagne. MKKCONFIG may not be defined resulting in failure to create apps/Kconfig.

Browse Source
This commit is contained in:
Gregory Nutt 2018-06-11 10:21:22 -06:00
parent 36e04b3533
commit bf232771f6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Make.defs
View File

@ -60,15 +60,12 @@ endif
ifeq ($(DIRLINK),) ifeq ($(DIRLINK),)
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
MKKCONFIG = $(APPDIR)\tools\mkkconfig.bat
DIRLINK = $(TOPDIR)\tools\link.bat DIRLINK = $(TOPDIR)\tools\link.bat
DIRUNLINK = $(TOPDIR)\tools\unlink.bat DIRUNLINK = $(TOPDIR)\tools\unlink.bat
else ifeq ($(CONFIG_WINDOWS_MSYS),y) else ifeq ($(CONFIG_WINDOWS_MSYS),y)
MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
else else
MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
DIRLINK = $(TOPDIR)/tools/copydir.sh DIRLINK = $(TOPDIR)/tools/copydir.sh
@ -78,6 +75,14 @@ endif
endif endif
endif endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
MKKCONFIG = $(APPDIR)\tools\mkkconfig.bat
else ifeq ($(CONFIG_WINDOWS_MSYS),y)
MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh
else
MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh
endif
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
INCDIROPT = -w INCDIROPT = -w
endif endif