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

This change fixes a build problem that only occurs when reconfiguring from Linux to Windows or vice-versa. It is a problem that was present but not usually experienced until two things happened: (1) The pre_config target was added to run before the menconfig operation and (2) the context target was added before the pre_config target in order to set up the correct symbolic links (in the apps/platform directory) needed by the pre_config target.

Browse Source 
But then now if you start with a Linux system and run 'make menuconfig' to switch to Linux, the context target will execute first and set up POSIX style symbolic links before doing the menuconfig.  Then after the menuconfig, the make will fail on Windows if you are using a Windows native toolchain because that native toolchain cannot follow the Cygwin-style symbolic links.

The first here is to also execute the clean_context AFTER executing menuconfig.  A lot more happens now:  It used to be that doing 'make menuconfig' only did the menuconfig operation.  No it does context, pre_config, menuconfig, clean_context.  Not nearly as snappy as it used to be.
This commit is contained in:
Gregory Nutt 2016-06-28 12:40:17 -06:00
parent 723165d499
commit 0f123d2551
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.unix
View File

@ -480,24 +480,36 @@ pass2dep: context tools/mkdeps$(HOSTEXEEXT) tools/cnvwindeps$(HOSTEXEEXT)
# location: http://ymorin.is-a-geek.org/projects/kconfig-frontends. See
# README.txt file in the NuttX tools GIT repository for additional information.
config: context apps_preconfig
do_config: context apps_preconfig
$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf Kconfig
oldconfig: context apps_preconfig
config: do_config clean_context
do_oldconfig: context apps_preconfig
$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --oldconfig Kconfig
olddefconfig: context apps_preconfig
oldconfig: do_oldconfig clean_context
do_olddefconfig: context apps_preconfig
$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --olddefconfig Kconfig
menuconfig: context apps_preconfig
olddefconfig: do_olddefconfig clean_context
do_menuconfig: context apps_preconfig
$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-mconf Kconfig
qconfig: context apps_preconfig
menuconfig: do_menuconfig clean_context
do_qconfig: context apps_preconfig
$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-qconf Kconfig
qconfig: do_qconfig clean_context
gconfig: context apps_preconfig
$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-gconf Kconfig
gconfig: do_gconfig clean_context
# export
#
# The export target will package the NuttX libraries and header files into

16
Makefile.win
View File

@ -480,18 +480,26 @@ pass2dep: context tools\mkdeps$(HOSTEXEEXT)
# location: http://ymorin.is-a-geek.org/projects/kconfig-frontends. See
# misc\tools\README.txt for additional information.
config: context apps_preconfig
do_config: context apps_preconfig
$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf Kconfig
oldconfig: context apps_preconfig
config: do_config clean_context
do_oldconfig: context apps_preconfig
$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig
olddefconfig: context apps_preconfig
oldconfig: do_oldconfig clean_context
do_olddefconfig: context apps_preconfig
$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --olddefconfig Kconfig
menuconfig: context configenv apps_preconfig
olddefconfig: do_olddefconfig clean_context
do_menuconfig: context configenv apps_preconfig
$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-mconf Kconfig
menuconfig: do_menuconfig clean_context
# export
#
# The export target will package the NuttX libraries and header files into