mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] defaultenv: fix empty CONFIG_DEFAULT_ENVIRONMENT_PATH
@ 2011-03-22  6:57 Jon Ringle
  2011-03-23  8:47 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Jon Ringle @ 2011-03-22  6:57 UTC (permalink / raw)
  To: barebox

if CONFIG_DEFAULT_ENVIRONMENT_PATH="" then
$(DEFAULT_ENVIRONMENT_PATH) expands to 'defaultenv "" '
The "" would cause every single file found in $(srctree) to be included in
$(ENV_FILES). This would then cause scripts/mod/sumversions.c to get
recompiled using $(CC) and fail compilation if $(CC) points to a newlib
cross compiler

Signed-off-by: Jon Ringle <jon@ringle.org>
---
 common/Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/common/Makefile b/common/Makefile
index 753455b..cda2ad1 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -30,9 +30,11 @@ ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_GENERIC),y)
 DEFAULT_ENVIRONMENT_PATH = "defaultenv"
 endif
 
+ifneq ($(CONFIG_DEFAULT_ENVIRONMENT_PATH),"")
 DEFAULT_ENVIRONMENT_PATH += $(CONFIG_DEFAULT_ENVIRONMENT_PATH)
+endif
 
-ENV_FILES := $(shell cd $(srctree); for i in $(DEFAULT_ENVIRONMENT_PATH); do find $${i} -type f -exec readlink -f {} \;; done)
+ENV_FILES := $(shell cd $(srctree); for i in $(DEFAULT_ENVIRONMENT_PATH); do find $${i} -type f -exec readlink -f '{}' \;; done)
 
 endif # ifdef CONFIG_DEFAULT_ENVIRONMENT
 
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] defaultenv: fix empty CONFIG_DEFAULT_ENVIRONMENT_PATH
  2011-03-22  6:57 [PATCH] defaultenv: fix empty CONFIG_DEFAULT_ENVIRONMENT_PATH Jon Ringle
@ 2011-03-23  8:47 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2011-03-23  8:47 UTC (permalink / raw)
  To: Jon Ringle; +Cc: barebox

Hi Jon,

On Tue, Mar 22, 2011 at 02:57:08AM -0400, Jon Ringle wrote:
> if CONFIG_DEFAULT_ENVIRONMENT_PATH="" then
> $(DEFAULT_ENVIRONMENT_PATH) expands to 'defaultenv "" '
> The "" would cause every single file found in $(srctree) to be included in
> $(ENV_FILES). This would then cause scripts/mod/sumversions.c to get
> recompiled using $(CC) and fail compilation if $(CC) points to a newlib
> cross compiler

Indeed an annoying bug. Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-03-23  8:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-22  6:57 [PATCH] defaultenv: fix empty CONFIG_DEFAULT_ENVIRONMENT_PATH Jon Ringle
2011-03-23  8:47 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox