Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-10 01:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merger from rtems-4-6-branch.

Browse Source
This commit is contained in:
Ralf Corsepius
2003-03-24 10:23:16 +00:00
parent 6285bc89f3
commit dbe9b0ca1c
3 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cpukit/aclocal/env-rtemsbsp.m4
View File

@@ -5,7 +5,6 @@ dnl used by per BSP configure scripts
AC_DEFUN(RTEMS_ENV_RTEMSBSP, AC_DEFUN(RTEMS_ENV_RTEMSBSP,
[dnl [dnl
AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
AC_ARG_VAR([CPU_CFLAGS],[]) AC_ARG_VAR([CPU_CFLAGS],[])
AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[]) AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[])
@@ -31,9 +30,6 @@ AC_SUBST(PROJECT_INCLUDE)
project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib" project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib"
AC_SUBST(project_libdir) AC_SUBST(project_libdir)
RTEMS_ROOT="$PROJECT_ROOT/c/$RTEMS_BSP"
AC_SUBST(RTEMS_ROOT)
RTEMS_ENABLE_BARE RTEMS_ENABLE_BARE
AC_SUBST(BARE_CPU_MODEL) AC_SUBST(BARE_CPU_MODEL)
AC_SUBST(BARE_CPU_CFLAGS) AC_SUBST(BARE_CPU_CFLAGS)

6
cpukit/aclocal/env-rtemscpu.m4
View File

@@ -4,7 +4,6 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU,
[AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) [AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
if test x"$multilib" = x"yes"; then if test x"$multilib" = x"yes"; then
## FIXME: There is no multilib BSP
AS_IF([test -n "$with_multisubdir"], AS_IF([test -n "$with_multisubdir"],
[MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`]) [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`])
AC_SUBST(MULTIBUILDTOP) AC_SUBST(MULTIBUILDTOP)
@@ -16,12 +15,9 @@ if test x"$multilib" = x"yes"; then
PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include" PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include"
AC_SUBST(PROJECT_INCLUDE) AC_SUBST(PROJECT_INCLUDE)
project_libdir="\$(PROJECT_ROOT)/lib" project_libdir="\$(PROJECT_ROOT)/lib/\$(MULTISUBDIR)"
AC_SUBST(project_libdir) AC_SUBST(project_libdir)
RTEMS_ROOT="${PROJECT_ROOT}"
AC_SUBST(RTEMS_ROOT)
includedir="\${exec_prefix}/lib/include" includedir="\${exec_prefix}/lib/include"
libdir="${libdir}\$(MULTISUBDIR)" libdir="${libdir}\$(MULTISUBDIR)"
else else

23
cpukit/aclocal/tool-paths.m4
View File

@@ -1,23 +0,0 @@
AC_DEFUN(RTEMS_TOOLPATHS,
[
# tooldir='$(exec_prefix)/'$target_alias
# Temporary work-around until building in source tree is supported
AC_REQUIRE([RTEMS_PROJECT_ROOT])
tooldir='$(PROJECT_ROOT)'
AC_SUBST(tooldir)
project_includedir='$(tooldir)'/include
AC_SUBST(project_includedir)
project_libdir='$(tooldir)/lib$(MULTISUBDIR)'
AC_SUBST(project_libdir)
project_bindir='$(tooldir)/bin'
AC_SUBST(project_bindir)
rtems_bspdir='$(prefix)/${RTEMS_BSP}'
AC_SUBST(rtems_bspdir)
rtems_makedir='$(prefix)/make'
AC_SUBST(rtems_makedir)
])