remove empty when cleaning

1 files changed, 11 insertions, 3 deletions

diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua
index 228219513..702d97c82 100644
--- a/xmake/core/base/os.lua
+++ b/xmake/core/base/os.lua
@@ -172,8 +172,8 @@ function os.mv(src, dst)
     return true
 end
 
--- remove file or directory
-function os.rm(file_or_dir, emptydir)
+-- remove file or directory and remove it if the super directory be empty
+function os.rm(file_or_dir, rm_superdir_if_empty)
     
     -- check
     assert(file_or_dir)
@@ -187,11 +187,19 @@ function os.rm(file_or_dir, emptydir)
     -- is directory?
     elseif os.isdir(file_or_dir) then
         -- remove directory
-        if not os.rmdir(file_or_dir, emptydir) then
+        if not os.rmdir(file_or_dir) then
             return false, string.format("cannot remove directory %s %s", file_or_dir, os.strerror())
         end
     end
 
+    -- remove the super directory if be empty
+    if rm_superdir_if_empty then
+        local superdir = path.directory(file_or_dir)
+        if os.isdir(superdir) then
+            os.rmdir(superdir, true)
+        end
+    end
+
     -- ok
     return true
 end