Mercurial > hg > truffle
changeset 19804:ad32fd810c83
mx: Support systems where SC_ARG_MAX has not defined limit
| author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
|---|---|
| date | Thu, 12 Mar 2015 12:45:04 +0100 |
| parents | 17cbf6870ca7 |
| children | 4bc952439f2a 73dddd2d8710 |
| files | mxtool/mx.py |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mxtool/mx.py Thu Mar 12 07:29:31 2015 +0100 +++ b/mxtool/mx.py Thu Mar 12 12:45:04 2015 +0100 @@ -2806,7 +2806,7 @@ if exists(dirname(dst)) and (not exists(dst) or os.path.getmtime(dst) < os.path.getmtime(src)): shutil.copyfile(src, dst) -def _chunk_files_for_command_line(files, limit=None, pathFunction=None): +def _chunk_files_for_command_line(files, limit=None, pathFunction=lambda f: f): """ Returns a generator for splitting up a list of files into chunks such that the size of the space separated file paths in a chunk is less than a given limit. @@ -2824,9 +2824,11 @@ # Using just SC_ARG_MAX without extra downwards adjustment # results in "[Errno 7] Argument list too long" on MacOS. syslimit = os.sysconf('SC_ARG_MAX') - 20000 + if syslimit == -1: + syslimit = 262144 # we could use sys.maxint but we prefer a more robust smaller value limit = syslimit - commandLinePrefixAllowance for i in range(len(files)): - path = files[i] if pathFunction is None else pathFunction(files[i]) + path = pathFunction(files[i]) size = len(path) + 1 if chunkSize + size < limit: chunkSize += size