diff options
| author | Chris Johns <chrisj@rtems.org> | 2015-07-20 13:49:42 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2015-07-20 13:49:42 +1000 |
| commit | 6444d5806dbdd66dd23a18df824872eb84fbe248 (patch) | |
| tree | 02c78ffb40d0ec8ff12a217482e290367eceb0ce /source-builder/defaults.mc | |
| parent | rtems4.11: OpenMP support for ARM, PowerPC, SPARC (diff) | |
| download | rtems-source-builder-6444d5806dbdd66dd23a18df824872eb84fbe248.tar.bz2 | |
Canandian Cross Compiling and RTEMS 3rd party package building Fixes.
The change fixes installing for RTEMS 3rd Party packages where the
RSB considered them Canadian Cross Compiling (Cxc). Fixing the
Cxc issue broke real Cxc builds. The change corrects the issue of
macros being changed in the Cxc and the prep data not being udpated.
The configuration is loaded again after the updated macros. The
macros are also copied and restored to ensure a clean stable base.
The change also introduces --rtems-tools and --rtems-bsp to align
the command line with the waf configure process or RTEMS application.
Diffstat (limited to 'source-builder/defaults.mc')
| -rw-r--r-- | source-builder/defaults.mc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source-builder/defaults.mc b/source-builder/defaults.mc index ce81c35..d38d090 100644 --- a/source-builder/defaults.mc +++ b/source-builder/defaults.mc @@ -79,12 +79,14 @@ _sourcedir: dir, optional, '%{_topdir}/sources' _patchdir: dir, optional, '%{_topdir}/patches:%{_sbdir}/patches' _builddir: dir, optional, '%{_topdir}/build/%{buildname}' _buildcxcdir: dir, optional, '%{_topdir}/build/%{buildname}-cxc' +_buildxcdir: dir, optional, '%{_topdir}/build/%{buildname}-xc' _docdir: dir, none, '%{_defaultdocdir}' _tmppath: dir, none, '%{_topdir}/build/tmp' _tmproot: dir, none, '%{_tmppath}/sb-%{_uid}/%{_bset}' _tmpcxcroot: dir, none, '%{_tmppath}/sb-%{_uid}-cxc/%{_bset}' buildroot: dir, none, '%{_tmppath}/%{buildname}-%{_uid}' buildcxcroot: dir, none, '%{_tmppath}/%{buildname}-%{_uid}-cxc' +buildxcroot: dir, none, '%{_tmppath}/%{buildname}-%{_uid}-xx' _datadir: dir, none, '%{_prefix}/share' _defaultdocdir: dir, none, '%{_prefix}/share/doc' _exeext: none, none, '' @@ -301,7 +303,7 @@ fi''' # Host/build flags. host_build_flags: none, none, ''' # Host and build flags, Cross build if host and build are different and -# Cxc build idf target is deifned and also different. +# Cxc build if target is deifned and also different. # Note, gcc is not ready to be compiled with -std=gnu99 (this needs to be checked). if test "%{_build}" != "%{_host}" ; then # Cross build |