diff options
Diffstat (limited to '')
-rw-r--r-- | aclocal/env-rtemscpu.m4 | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/aclocal/env-rtemscpu.m4 b/aclocal/env-rtemscpu.m4 index 613ea83ca2..796f875db4 100644 --- a/aclocal/env-rtemscpu.m4 +++ b/aclocal/env-rtemscpu.m4 @@ -3,22 +3,38 @@ dnl $Id$ AC_DEFUN(RTEMS_ENV_RTEMSCPU, [AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) -if test x"$multilib" = x"no"; then - RTEMS_ENV_RTEMSBSP - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -else +if test x"$multilib" = x"yes"; then ## FIXME: There is no multilib BSP - rtems_cv_RTEMS_BSP="multilib" - RTEMS_BSP="$rtems_cv_RTEMS_BSP" - AC_SUBST(RTEMS_BSP) - RTEMS_BSP_SPECS="" AC_SUBST(RTEMS_BSP_SPECS) - GCC_SPECS="-B\$(PROJECT_ROOT)/ -B\$(PROJECT_ROOT)/lib/" + if test -n "$with_multisubdir"; then + MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'` + fi + AC_SUBST(MULTIBUILDTOP) + + if test -n "$with_multisubdir"; then + MULTISUBDIR="/$with_multisubdir" + fi + AC_SUBST(MULTISUBDIR) + + PROJECT_ROOT="${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)" + GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include" AC_SUBST(GCC_SPECS) - RTEMS_ROOT=$PROJECT_ROOT/c + PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include" + AC_SUBST(PROJECT_INCLUDE) + + PROJECT_RELEASE="\$(PROJECT_ROOT)" + AC_SUBST(PROJECT_RELEASE) + + RTEMS_ROOT=${PROJECT_ROOT} AC_SUBST(RTEMS_ROOT) + + includedir="\${exec_prefix}/lib/include" + libdir="${libdir}\$(MULTISUBDIR)" +else + RTEMS_ENV_RTEMSBSP + RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) fi ]) |