diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-11-09 10:25:28 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-11-09 10:25:28 +0000 |
| commit | 3f7467606550930cd0e3a7ac9d31647d66d3c9de (patch) | |
| tree | f3d5bb88eca0b0cbc5a218016c7214d07804f6b8 /c | |
| parent | 2005-11-09 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-3f7467606550930cd0e3a7ac9d31647d66d3c9de.tar.bz2 | |
2005-11-09 Ralf Corsepius <ralf.corsepius@rtems.org>
* configure.ac: Reflect changes to testsuites.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/configure.ac | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index a287fc17e1..af4fede880 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,7 @@ +2005-11-09 Ralf Corsepius <ralf.corsepius@rtems.org> + + * configure.ac: Reflect changes to testsuites. + 2005-11-08 Ralf Corsepius <ralf.corsepius@rtems.org> * automake/compile.am: Remove GCCSPECS. diff --git a/c/src/configure.ac b/c/src/configure.ac index 032e6ace36..95ebec312d 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -183,15 +183,31 @@ RTEMS_BSP_CONFIG_SUBDIR( ], [test x"$enable_tests" = xyes && test x"$enable_ada" = xyes]) +# HACK ALERT! + +# FIXME: Assume multilib implies in-source-tree multilibs +# Build testsuites multilibbed RTEMS_BSP_CONFIG_SUBDIR( [testsuites],[../../testsuites], ['--enable-rtems-root=../' \ - '--with-project-root=${with_project_root}../' \ + '--enable-project-root=${with_project_root}../$RTEMS_BSP' \ + '--with-project-top=${with_project_top}../' \ + '--enable-rtemsbsp=$RTEMS_BSP' \ + 'CFLAGS="${CFLAGS}"' \ + ], + [test x"$enable_tests" != x"no" && test x"$multilib" = xno]) + +# Build testsuites non-multilibbed +RTEMS_BSP_CONFIG_SUBDIR( + [testsuites],[../../testsuites], + ['--enable-rtems-root=../' \ + '--enable-cpukit-root=${with_project_root}..' \ + '--enable-project-root=${with_project_root}../$RTEMS_BSP' \ '--with-project-top=${with_project_top}../' \ '--enable-rtemsbsp=$RTEMS_BSP' \ 'CFLAGS="${CFLAGS}"' \ ], - [test x"$enable_tests" != x"no"]) + [test x"$enable_tests" != x"no" && test x"$multilib" = xyes]) AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS]) |