mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2025-12-05 23:23:13 +00:00
Update from Ralf Corsepius:
Yep, I have a bunch of bug-fixes and additions pending (Yet another monster patch, ... I can hear you scream :-). 1) configure.in : one AC_CONFIG_HEADER(...) line too much. 5) configure.in: --enable-cpp should probably be renamed to --enable-cxx, as gnu-programs use "cxx" to specify C++ specific configure options, while cpp is used for the preprocessor (e.g egcs uses --with-cxx-includedir, autoconf internally uses $CXX),
This commit is contained in:
77
configure.in
77
configure.in
@@ -43,12 +43,12 @@ AC_ARG_ENABLE(rtems-inlines, \
|
|||||||
*) AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;;
|
*) AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;;
|
||||||
esac],[RTEMS_USE_MACROS=no])
|
esac],[RTEMS_USE_MACROS=no])
|
||||||
|
|
||||||
AC_ARG_ENABLE(cpp, \
|
AC_ARG_ENABLE(cxx, \
|
||||||
[ --enable-cpp enable C++ support, and build the rtems++ library], \
|
[ --enable-cxx enable C++ support, and build the rtems++ library], \
|
||||||
[case "${enableval}" in
|
[case "${enableval}" in
|
||||||
yes) RTEMS_HAS_CPLUSPLUS=yes ;;
|
yes) RTEMS_HAS_CPLUSPLUS=yes ;;
|
||||||
no) RTEMS_HAS_CPLUSPLUS=no ;;
|
no) RTEMS_HAS_CPLUSPLUS=no ;;
|
||||||
*) AC_MSG_ERROR(bad value ${enableval} for enable-cpp option) ;;
|
*) AC_MSG_ERROR(bad value ${enableval} for enable-cxx option) ;;
|
||||||
esac], [RTEMS_HAS_CPLUSPLUS=no])
|
esac], [RTEMS_HAS_CPLUSPLUS=no])
|
||||||
|
|
||||||
AC_ARG_ENABLE(gcc28, \
|
AC_ARG_ENABLE(gcc28, \
|
||||||
@@ -76,7 +76,6 @@ AC_PATH_PROG(LN,ln)
|
|||||||
AC_PROG_LN_S
|
AC_PROG_LN_S
|
||||||
AC_PATH_PROG(CHMOD,chmod)
|
AC_PATH_PROG(CHMOD,chmod)
|
||||||
AC_PATH_PROG(SORT,sort)
|
AC_PATH_PROG(SORT,sort)
|
||||||
AC_CHECK_FUNCS(strerror)
|
|
||||||
|
|
||||||
dnl check mkdir behaviour, try to get mkdir -p -m 0755
|
dnl check mkdir behaviour, try to get mkdir -p -m 0755
|
||||||
RTEMS_PATH_MKDIR
|
RTEMS_PATH_MKDIR
|
||||||
@@ -102,8 +101,6 @@ AC_MSG_ERROR(
|
|||||||
[ Please contact your system administrator] );
|
[ Please contact your system administrator] );
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl END configure.host.in
|
|
||||||
|
|
||||||
dnl BEGIN configure.target.in
|
dnl BEGIN configure.target.in
|
||||||
|
|
||||||
dnl echo "TARGET"
|
dnl echo "TARGET"
|
||||||
@@ -172,6 +169,51 @@ else
|
|||||||
AC_MSG_ERROR(no)
|
AC_MSG_ERROR(no)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl NOTE: host_os is automatically set by autoconf
|
||||||
|
|
||||||
|
if [[ "${program_prefix}" = "NONE" ]] ; then
|
||||||
|
if [[ "${target}" = "${host}" ]] ; then
|
||||||
|
program_prefix=
|
||||||
|
else
|
||||||
|
program_prefix=${target}-
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl check target cc
|
||||||
|
CC="$program_prefix"gcc
|
||||||
|
RTEMS_PROG_CC
|
||||||
|
|
||||||
|
dnl check if the compiler supports --specs if gcc28 is requested
|
||||||
|
if test "$RTEMS_USE_GCC272" != "yes" ; then
|
||||||
|
RTEMS_GCC_SPECS
|
||||||
|
if test "$rtems_cv_gcc_specs" = "no"; then
|
||||||
|
AC_MSG_WARN([*** disabling --enable-gcc28])
|
||||||
|
RTEMS_USE_GCC272=yes
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl check if the target compiler may use --pipe
|
||||||
|
RTEMS_GCC_PIPE
|
||||||
|
|
||||||
|
dnl check for g++
|
||||||
|
if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
|
||||||
|
CXX="$program_prefix"g++
|
||||||
|
RTEMS_PROG_CXX
|
||||||
|
AC_PATH_PROG(CXX_FOR_TARGET,"$program_prefix"g++,no)
|
||||||
|
else
|
||||||
|
CXX_FOR_TARGET="no"
|
||||||
|
fi
|
||||||
|
|
||||||
|
RTEMS_CANONICALIZE_TOOLS
|
||||||
|
test "$rtems_cv_gcc_pipe" = "yes" && CC_FOR_TARGET="$CC_FOR_TARGET --pipe"
|
||||||
|
|
||||||
|
dnl check host cc
|
||||||
|
AC_PROG_CC
|
||||||
|
|
||||||
|
dnl check for host library functions
|
||||||
|
dnl NOTE: must be called after AC_PROG_CC
|
||||||
|
AC_CHECK_FUNCS(strerror)
|
||||||
|
|
||||||
# find all the Executive Makefiles
|
# find all the Executive Makefiles
|
||||||
RTEMS_CHECK_MAKEFILE(c/src/exec/score/tools/$target_cpu)
|
RTEMS_CHECK_MAKEFILE(c/src/exec/score/tools/$target_cpu)
|
||||||
RTEMS_CHECK_MAKEFILE(c/src/exec/rtems)
|
RTEMS_CHECK_MAKEFILE(c/src/exec/rtems)
|
||||||
@@ -251,21 +293,6 @@ fi
|
|||||||
dnl END configure.target.in
|
dnl END configure.target.in
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Target configurations are listed in alphabetical order.
|
|
||||||
# The BSPs for a target configuration are also listed in alphabetical order.
|
|
||||||
#
|
|
||||||
|
|
||||||
dnl NOTE: host_os is automatically set by autoconf
|
|
||||||
|
|
||||||
if [[ "${program_prefix}" = "NONE" ]] ; then
|
|
||||||
if [[ "${target}" = "${host}" ]] ; then
|
|
||||||
program_prefix=
|
|
||||||
else
|
|
||||||
program_prefix=${target}-
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
PROJECT_ROOT=`pwd;`
|
PROJECT_ROOT=`pwd;`
|
||||||
|
|
||||||
# If RTEMS macros are enabled, then use them. Otherwise, use inlines.
|
# If RTEMS macros are enabled, then use them. Otherwise, use inlines.
|
||||||
@@ -359,11 +386,12 @@ RTEMS_CHECK_MAKEFILE(c/src/tests/samples)
|
|||||||
|
|
||||||
AC_CONFIG_HEADER(c/build-tools/src/config.h)
|
AC_CONFIG_HEADER(c/build-tools/src/config.h)
|
||||||
|
|
||||||
AC_CONFIG_HEADER(c/build-tools/src/config.h)
|
|
||||||
|
|
||||||
# try not to explicitly list a Makefile here
|
# try not to explicitly list a Makefile here
|
||||||
AC_OUTPUT(
|
AC_OUTPUT(
|
||||||
Makefile
|
Makefile
|
||||||
|
make/host.cfg
|
||||||
|
make/target.cfg
|
||||||
|
make/Templates/Makefile.inc
|
||||||
c/Makefile
|
c/Makefile
|
||||||
c/src/Makefile
|
c/src/Makefile
|
||||||
c/src/exec/Makefile
|
c/src/exec/Makefile
|
||||||
@@ -393,9 +421,6 @@ c/src/tests/support/wrapup/Makefile
|
|||||||
c/src/tests/tools/Makefile
|
c/src/tests/tools/Makefile
|
||||||
c/src/tests/tools/generic/Makefile
|
c/src/tests/tools/generic/Makefile
|
||||||
$makefiles
|
$makefiles
|
||||||
make/host.cfg
|
|
||||||
make/target.cfg
|
|
||||||
make/Templates/Makefile.inc
|
|
||||||
c/update-tools/Makefile)
|
c/update-tools/Makefile)
|
||||||
|
|
||||||
echo
|
echo
|
||||||
|
|||||||
Reference in New Issue
Block a user