diff options
| author | John Sonnenschein <johns@joyent.com> | 2011-12-20 22:02:19 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2011-12-20 22:02:19 +0000 |
| commit | 1636e739ebc2ac80c49a1e69f71fda812db48850 (patch) | |
| tree | fc50ff3fb0191895828671198e8ee7cb93cb5859 /usr/src/tools/scripts/nightly.sh | |
| parent | 84c9e00cfac0317d1e164e792a2386a9440b833a (diff) | |
| parent | e7c3f416aa65d7864d1198dcfead49a8d7583a58 (diff) | |
| download | illumos-joyent-1636e739ebc2ac80c49a1e69f71fda812db48850.tar.gz | |
Merge branch 'master' into gcc4
Diffstat (limited to 'usr/src/tools/scripts/nightly.sh')
| -rw-r--r-- | usr/src/tools/scripts/nightly.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index abebb16b51..b64ed6f8ad 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -2138,7 +2138,7 @@ if [ "$i_FLAG" = "n" -a -d "$SRC" ]; then # Remove all .make.state* files, just in case we are restarting # the build after having interrupted a previous 'make clobber'. - find . \( -name SCCS -o -name .hg -o -name .svn -o -name .git \ + find . \( -name SCCS -o -name .hg -o -name .svn -o name .git \ -o -name 'interfaces.*' \) -prune \ -o -name '.make.*' -print | xargs rm -f @@ -2173,7 +2173,7 @@ if [ "$i_FLAG" = "n" -a -d "$SRC" ]; then # under source code control, so leave them alone. # We should probably blow away temporary directories too. cd $SRC - find $relsrcdirs \( -name SCCS -o -name .hg -o -name .svn -o -name .git\ + find $relsrcdirs \( -name SCCS -o -name .hg -o -name .svn -o name .git\ -o -name 'interfaces.*' \) -prune -o \ \( -name '.make.*' -o -name 'lib*.a' -o -name 'lib*.so*' -o \ -name '*.o' \) -print | \ |