diff options
author | Chris Johns <chrisj@rtems.org> | 2015-03-18 08:21:34 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2015-03-18 08:21:34 +1100 |
commit | b0f9e30fa46a8025b76bf86321ebe585de8972f4 (patch) | |
tree | 6d41e695fa3fde9c57df29696f2e5874a064116a /rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg | |
parent | Add gdb-7.8.2 hash. (diff) | |
download | rtems-source-builder-b0f9e30fa46a8025b76bf86321ebe585de8972f4.tar.bz2 |
Add merge to the git and download modules to merge after a fetch.
Update the RTEMS tools and newlib-git to merge after the fetch.
Diffstat (limited to 'rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg')
-rw-r--r-- | rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg b/rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg index 98caa2f..0e92b70 100644 --- a/rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg @@ -35,7 +35,7 @@ # # Newlib is from CVS and this is via a git mirror. No hash on GIT # -%source set newlib git://sourceware.org/git/newlib.git?fetch?reset=hard?branch=master?checkout=%{newlib_version} +%source set newlib git://sourceware.org/git/newlib.git?fetch?reset=hard?merge?branch=master?checkout=%{newlib_version} # # The gcc/newlib build instructions. We use 4.9 Release 1. |