diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-29 15:29:31 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-29 15:29:31 +0000 |
commit | fe5851ceaec2e233c48fc5707ece2f69fce77090 (patch) | |
tree | e926ecf6fa2cc4e6be0211709ba8c30c415d2200 /aclocal/multilib.m4 | |
parent | Removed as it was orphaned by previous patches. (diff) | |
download | rtems-fe5851ceaec2e233c48fc5707ece2f69fce77090.tar.bz2 |
Patch rtems-rc-20000627-1 from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that is part of the multilib/gnu-canonicalization movement:
Changes:
* New m4-macro: aclocal/multilib.am
* Suppress multiprocessing if --enable-multilib is given to
configure
Notes:
For now this patch only suppresses multiprocessing if
--enable-multilib is given to configure and should not have any
other side-effects, ie. it works around a minor issue which prevents
introduction of multilibs in general.
The RTEMS_ENABLE_MULTILIB_MASTER macro is the core part to build
real multilibs, but can not be applied before other multilib related
issues with RTEMS have been solved. (e.g. sptables.h, bsp_specs,
Cygnus/Gnu canonicalization, _RTEMS_version, targopts.h, changing
the installation point/tooldir support, etc.).
Diffstat (limited to 'aclocal/multilib.m4')
-rw-r--r-- | aclocal/multilib.m4 | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/aclocal/multilib.m4 b/aclocal/multilib.m4 new file mode 100644 index 0000000000..2c975c8fbd --- /dev/null +++ b/aclocal/multilib.m4 @@ -0,0 +1,59 @@ +dnl This provides configure definitions used for multilib support + +dnl parts of these macros are derived from newlib-1.8.2's multilib support + +AC_DEFUN(RTEMS_ENABLE_MULTILIB, +[ +AC_ARG_ENABLE(multilib, +[ --enable-multilib build many library versions (default)], +[case "${enableval}" in + yes) multilib=yes ;; + no) multilib=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; + esac], [multilib=yes])dnl + +AM_CONDITIONAL(MULTILIB,test x"${multilib}" = x"yes") +]) + +AC_DEFUN(RTEMS_ENABLE_MULTILIB_MASTER, +[ +AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) + +dnl We may get other options which we don't document: +dnl --with-target-subdir, --with-multisrctop, --with-multisubdir + +test -z "[$]{with_target_subdir}" && with_target_subdir=. + +if test "[$]{srcdir}" = "."; then + if test "[$]{with_target_subdir}" != "."; then + multilib_basedir="[$]{srcdir}/[$]{with_multisrctop}../ifelse([$2],,,[$2])" + else + multilib_basedir="[$]{srcdir}/[$]{with_multisrctop}ifelse([$2],,,[$2])" + fi +else + multilib_basedir="[$]{srcdir}/ifelse([$2],,,[$2])" +fi +AC_SUBST(multilib_basedir) + +if test "${multilib}" = "yes"; then + multilib_arg="--enable-multilib" +else + multilib_arg= +fi + +AC_OUTPUT_COMMANDS( + if test -n "$CONFIG_FILES"; do + $ac_file" = ifelse([$1],,Makefile,[$1]) \ + . ${multilib_basedir}/../config-ml.in + fi, + srcdir=${srcdir} + host=${host} + target=${target} +# with_multisrctop="${with_multisrctop}" +# with_target_subdir="${with_target_subdir}" + with_multisubdir="${with_multisubdir}" + ac_configure_args="${multilib_arg} ${ac_configure_args}" + CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + multilib_basedir=${multilib_basedir} + CC="${CC}") +]) |