diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-04 12:35:47 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-04 12:35:47 -0600 |
| commit | 89627d6c300f03551d82a672d634ed0217a241a4 (patch) | |
| tree | b362153fa2b538fa7bf100465160438244812b19 | |
| parent | 26f5a3472584cc27fa4ac10aa1b892f4dd62b7ae (diff) | |
| download | nuttx-89627d6c300f03551d82a672d634ed0217a241a4.tar.gz nuttx-89627d6c300f03551d82a672d634ed0217a241a4.tar.bz2 nuttx-89627d6c300f03551d82a672d634ed0217a241a4.zip | |
Don't copy build scripts for kernel build 'make exports'
| -rw-r--r-- | nuttx/Makefile.unix | 9 | ||||
| -rw-r--r-- | nuttx/Makefile.win | 11 | ||||
| -rwxr-xr-x | nuttx/tools/mkexport.sh | 20 |
3 files changed, 30 insertions, 10 deletions
diff --git a/nuttx/Makefile.unix b/nuttx/Makefile.unix index 2d7bb4fca..c3fe360a7 100644 --- a/nuttx/Makefile.unix +++ b/nuttx/Makefile.unix @@ -39,12 +39,19 @@ include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)/Make.defs # Control build verbosity +# +# V=1,2: Enable echo of commands +# V=2: Enable bug/verbose options in tools and scripts ifeq ($(V),1) export Q := else +ifeq ($(V),2) +export Q := +else export Q := @ endif +endif # Default tools @@ -161,7 +168,7 @@ MKEXPORT_ARGS += -u endif endif -ifeq ($(V),1) +ifeq ($(V),2) MKEXPORT_ARGS += -d endif diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win index bb90d77e4..93cb39ab8 100644 --- a/nuttx/Makefile.win +++ b/nuttx/Makefile.win @@ -39,12 +39,19 @@ TOPDIR := ${shell echo %CD%} -include $(TOPDIR)\Make.defs # Control build verbosity +# +# V=1,2: Enable echo of commands +# V=2: Enable bug/verbose options in tools and scripts ifeq ($(V),1) export Q := else +ifeq ($(V),2) +export Q := +else export Q := @ endif +endif # This define is passed as EXTRADEFINES for kernel-mode builds. It is also passed # during PASS1 (but not PASS2) context and depend targets. @@ -154,6 +161,10 @@ MKEXPORT_ARGS = -u endif endif +ifeq ($(V),2) +MKEXPORT_ARGS += -d +endif + # This is the name of the final target (relative to the top level directorty) BIN = nuttx$(EXEEXT) diff --git a/nuttx/tools/mkexport.sh b/nuttx/tools/mkexport.sh index 562121bed..cbdcddc78 100755 --- a/nuttx/tools/mkexport.sh +++ b/nuttx/tools/mkexport.sh @@ -165,19 +165,21 @@ fi # Is there a linker script in this configuration? -if [ ! -z "${LDPATH}" ]; then +if [ "X${USRONLY}" != "Xy" ]; then + if [ ! -z "${LDPATH}" ]; then - # Apparently so. Verify that the script exists + # Apparently so. Verify that the script exists - if [ ! -f "${LDPATH}" ]; then - echo "MK: File ${LDPATH} does not exist" - exit 1 - fi + if [ ! -f "${LDPATH}" ]; then + echo "MK: File ${LDPATH} does not exist" + exit 1 + fi - # Copy the linker script + # Copy the linker script - cp -p "${LDPATH}" "${EXPORTDIR}/build/." || \ - { echo "MK: cp ${LDPATH} failed"; exit 1; } + cp -p "${LDPATH}" "${EXPORTDIR}/build/." || \ + { echo "MK: cp ${LDPATH} failed"; exit 1; } + fi fi # Save the compilation options |