clean empty dirs only in tarball creation

diff --git a/clean-source.sh b/clean-source.sh
index 64ba65fd288e54123232d59db72c8379d35ca507..6861e5b799c83b311a215b8feb8f3031cb8a5e71 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -778,8 +778,10 @@ if [ "${nacl:-1}" != "0" ]; then
        rm -rf native_client/toolchain/linux_x86_newlib
 fi
 
-# cleanup empty dirs
-find -type d '!' -name '.' -print0 | sort -zr | xargs -0 rmdir --ignore-fail-on-non-empty > REMOVED-dirs.txt
+if [ "${emptydirs:-0}" != "0" ]; then
+       # cleanup empty dirs
+       find -type d '!' -name '.' -print0 | sort -zr | xargs -0 rmdir --ignore-fail-on-non-empty > REMOVED-dirs.txt
+fi
 
 # report what's in them
 for a in REMOVED-*.txt; do

diff --git a/get-source.sh b/get-source.sh
index a4b549ed9f114908645123f5e86b133f19dc3454..15f8cfd61e89282eaa3e017ea1b149f86556dedc 100755 (executable)
--- a/get-source.sh
+++ b/get-source.sh
@@ -76,7 +76,7 @@ else
 fi
 
 if [ "$CHANNEL" != "dev" ]; then
-       sh -x $WORK_DIR/clean-source.sh v8=$v8 protobuf=0
+       sh -x $WORK_DIR/clean-source.sh v8=$v8 emptydirs=1
 fi
 
 # do not keep REMOVED*.txt in tarball. they are visible in .log anyway