From 04e6f7bffb71106516097299e37f57bb28cf9844 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 6 Jul 2000 20:13:35 +0000 Subject: Patch rtems-rc-20000705-3.diff from Ralf Corsepius that is a somewhat experimental, multilib-related patch: Changes: * Use RTEMS_ENV_RTEMSCPU instead of RTEMS_ENV_RTEMSBSP in configure.ins below exec/. At the moment, RTEMS_ENV_RTEMSCPU is more or less an optical change to emphasize that these subdirectories shall not depend on RTEMS_BSP than a real behavioral change. * Add AC_DEFINE_* to several aclocal/*.m4 macros to prepare autoheader/autoconf generated targopts.h and similiar configuration headers. * c/src/configure.in: remove exec from cfg_subdirs if multilibs are enabled (c/src is build per bsp, exec shall be build per cpu in c/ or from the toplevel in future, when multilibs are enabled.) Notes: * This patch should not have any impact on the current building scheme. * --enable-multilib still does not work. * running bootstrap from the toplevel directory is required. CVS: ---------------------------------------------------------------------- CVS: Enter Log. Lines beginning with `CVS:' are removed automatically CVS: CVS: Committing in . CVS: CVS: Modified Files: CVS: c/src/tests/libtests/termios/init.c CVS: ---------------------------------------------------------------------- --- c/src/configure.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'c/src/configure.in') diff --git a/c/src/configure.in b/c/src/configure.in index b13a6c4544..360c8b3683 100644 --- a/c/src/configure.in +++ b/c/src/configure.in @@ -17,6 +17,7 @@ RTEMS_CANONICAL_HOST AM_INIT_AUTOMAKE(rtems-c-src,$RTEMS_VERSION,no) AM_MAINTAINER_MODE +RTEMS_ENABLE_MULTILIB RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) @@ -25,7 +26,10 @@ RTEMS_CHECK_NETWORKING(RTEMS_BSP) ## Note: the order of the directories below is essential cfg_subdirs="make" +## Exclude exec from building if multilibs are enabled +if test x"$multilib" = x"no"; then cfg_subdirs="$cfg_subdirs exec" +fi cfg_subdirs="$cfg_subdirs lib" cfg_subdirs="$cfg_subdirs libmisc" -- cgit v1.2.3