Made distcc take parelization level as parameter

Changed localedef --force to posix compliance -c switch
This commit is contained in:
Pauli Nieminen 2008-08-22 16:53:42 +00:00
parent 447d8f74ac
commit c89e3a4a8e

View file

@ -80,7 +80,7 @@ opts.AddOptions(
PathOption('gettextdir', 'Root directory of Gettext\'s installation.', "", OptionalPath),
PathOption('gtkdir', 'Directory where GTK SDK is installed.', "", OptionalPath),
('host', 'Cross-compile host.', ''),
BoolOption('distcc', "Use distcc", False),
EnumOption('distcc', "Use distcc", "0", ["0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16"]),
BoolOption('ccache', "Use ccache", False),
('cxxtool', 'Set c++ compiler command if not using standard compiler.'),
BoolOption("fast", "Make scons faster at cost of less precise dependency tracking.", False)
@ -107,7 +107,9 @@ if env.get('cxxtool',""):
env['CXX'] = env['cxxtool']
env['ENV']['HOME'] = os.environ['HOME']
if env['distcc']: env.Tool('distcc')
if env['distcc']:
env.Tool('distcc')
SetOption("num_jobs", env['distcc'])
if env['ccache']: env.Tool('ccache')
@ -358,7 +360,7 @@ env.Clean(all, 'TAGS')
#
if env["nls"] and env['PLATFORM'] != 'win32':
env.Command(Dir("locales/C"), [], "-mkdir -p locales;echo | localedef --force \"$TARGET\" 2> /dev/null")
env.Command(Dir("locales/C"), [], "-mkdir -p locales;echo | localedef -c \"$TARGET\" 2> /dev/null")
language_cfg_re = re.compile(r"data/languages/(.*)\.cfg")
language_cfgs = glob("data/languages/*.cfg")
languages = Flatten(map(language_cfg_re.findall, language_cfgs))