diff options
| author | Chris Johns <chrisj@rtems.org> | 2013-04-03 14:31:41 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2013-04-03 14:31:41 +1100 |
| commit | 0add2eaa706665552af694b9fbb75f42d37044b8 (patch) | |
| tree | e2647e21c715c6e071387c114ad90f9638f73de0 /source-builder/sb/freebsd.py | |
| parent | Report the exit code on a shell macro failure. (diff) | |
| download | rtems-source-builder-0add2eaa706665552af694b9fbb75f42d37044b8.tar.bz2 | |
PR 2108, PR 2109. Add --jobs and --always-clean.
Refactor the options handling in defaults.py to allow the --jobs
option have varing specific parameters. The option supports 'none',
'max' and 'half' or a fraction to divide the number of CPUs or
an integer value which is the number of jobs. The --no-smp has
been removed.
The host specific modules have been changed to set the number of
CPUs in the defaults table.
Fixed the --keep-going to clean up is --always-clean is provided
even if the build has an error.
Diffstat (limited to 'source-builder/sb/freebsd.py')
| -rw-r--r-- | source-builder/sb/freebsd.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source-builder/sb/freebsd.py b/source-builder/sb/freebsd.py index eb78fa2..fe372de 100644 --- a/source-builder/sb/freebsd.py +++ b/source-builder/sb/freebsd.py @@ -35,9 +35,9 @@ def load(): e = execute.capture_execution() exit_code, proc, output = e.shell(sysctl + 'hw.ncpu') if exit_code == 0: - smp_mflags = '-j' + output.split(' ')[1].strip() + ncpus = output.split(' ')[1].strip() else: - smp_mflags = '' + ncpus = '1' if uname[4] == 'amd64': cpu = 'x86_64' else: @@ -46,6 +46,7 @@ def load(): if version.find('-') > 0: version = version.split('-')[0] defines = { + '_ncpus': ('none', 'none', ncpus), '_os': ('none', 'none', 'freebsd'), '_host': ('triplet', 'required', cpu + '-freebsd' + version), '_host_vendor': ('none', 'none', 'pc'), @@ -56,7 +57,6 @@ def load(): '_usr': ('dir', 'required', '/usr/local'), '_var': ('dir', 'optional', '/usr/local/var'), 'optflags': ('none', 'none', '-O2 -I/usr/local/include -L/usr/local/lib'), - '_smp_mflags': ('none', 'none', smp_mflags), '__bash': ('exe', 'optional', '/usr/local/bin/bash'), '__bison': ('exe', 'required', '/usr/local/bin/bison'), '__git': ('exe', 'required', '/usr/local/bin/git'), |