1 files changed, 5 insertions, 2 deletions

diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index e9a6fc8c61..501f4f8206 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -74,10 +74,13 @@ def exec_func(func, d, dirs = None):
     if not body:
         return
 
+    cleandirs = (data.expand(data.getVarFlag(func, 'cleandirs', d), d) or "").split()
+    for cdir in cleandirs:
+        os.system("rm -rf %s" % cdir)
+
     if not dirs:
-        dirs = (data.getVarFlag(func, 'dirs', d) or "").split()
+        dirs = (data.expand(data.getVarFlag(func, 'dirs', d), d) or "").split()
     for adir in dirs:
-        adir = data.expand(adir, d)
         mkdirhier(adir)
 
     if len(dirs) > 0: