Skip to contentSkip to conversation

build: Fix make errors generated when building 'distclean'

PATCH In review Vadim Bendebury 3 participants 3 messages Mar 28, 2013 – Apr 3, 2013 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 build: Fix make errors generated when building 'distclean'

It was noticed that when `make distclean' is run, the make process terminates with error reporting something like:

rm: cannot remove '/tmp/foobar/': Is a directory
make: *** [clobber] Error 1

The problem is that the list of files targeted for removal includes a directory in case CONFIG_SPL_TARGET is not set.

The fix has been tested as follows:

Ran several times the following sequence of commands:

CROSS_COMPILE=/usr/bin/arm-linux-gnueabi- make O=/tmp/foobar smdk5250_config CROSS_COMPILE=/usr/bin/arm-linux-gnueabi- make O=/tmp/foobar distclean

it did not cause an error, it used to before this change.

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Makefile +3 -1
index 12763ce..23f266a 100644
@@ -406,8 +406,10 @@ ALL-y += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map
 ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin
 ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin
 ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin
-ALL-$(CONFIG_SPL) += $(obj)$(subst ",,$(CONFIG_SPL_TARGET))
 ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin
+ifneq ($(CONFIG_SPL_TARGET),)
+ALL-$(CONFIG_SPL) += $(obj)$(subst ",,$(CONFIG_SPL_TARGET))
+endif
 
 # enable combined SPL/u-boot/dtb rules for tegra
 ifneq ($(CONFIG_TEGRA),)
Signature · 1 line
1.8.1.3
#1 lore raw

PATCH 1/1 build: Fix make errors generated when building 'distclean'

Quoted 13 lines · Vadim Bendebury

It was noticed that when `make distclean' is run, the make process terminates with error reporting something like:

rm: cannot remove '/tmp/foobar/': Is a directory
make: *** [clobber] Error 1

The problem is that the list of files targeted for removal includes a directory in case CONFIG_SPL_TARGET is not set.

The fix has been tested as follows:

Ran several times the following sequence of commands:

Quoted 8 lines

CROSS_COMPILE=/usr/bin/arm-linux-gnueabi- make O=/tmp/foobar
smdk5250_config
CROSS_COMPILE=/usr/bin/arm-linux-gnueabi- make O=/tmp/foobar distclean

it did not cause an error, it used to before this change.

#2 lore raw
In reply to Vadim Bendebury
Quoted 13 lines · Vadim Bendebury

It was noticed that when `make distclean' is run, the make process terminates with error reporting something like:

rm: cannot remove '/tmp/foobar/': Is a directory
make: *** [clobber] Error 1

The problem is that the list of files targeted for removal includes a directory in case CONFIG_SPL_TARGET is not set.

The fix has been tested as follows:

Ran several times the following sequence of commands:

Quoted 7 lines

CROSS_COMPILE=/usr/bin/arm-linux-gnueabi- make O=/tmp/foobar smdk5250_config CROSS_COMPILE=/usr/bin/arm-linux-gnueabi- make O=/tmp/foobar distclean

it did not cause an error, it used to before this change.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130403/81ced2d5/attachment.pgp>