Changeset 7a928017 in rtems


Ignore:
Timestamp:
06/12/03 06:28:16 (20 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
6381642a
Parents:
87a95526
Message:

2003-06-12 Ralf Corsepius <corsepiu@…>

  • configure.ac: Remove "BLEEDING EDGE" warning. Put docs into RTEMS_BUILD_CONFIG_SUBDIRS.
  • acinclude.m4: Add AC_PREREQ(2.57). Major overhaul (PR 412).
  • aclocal/prog-cc.m4: Add RTEMS_GCC_ISYSTEM.
  • aclocal/gcc-isystem.m4: New.
  • Makefile.am: Add aclocal/gcc-isystem.m4.
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    r87a95526 r7a928017  
    3131    aclocal/rtems-test-no-pause.m4 aclocal/rtems-top.m4 \
    3232    aclocal/target.m4 aclocal/tool-paths.m4 aclocal/bspopts.m4 \
    33     aclocal/ppc.m4 aclocal/bsp-configure.m4
     33    aclocal/ppc.m4 aclocal/bsp-configure.m4 aclocal/gcc-isystem.m4
    3434
    3535noinst_SCRIPTS = bootstrap

  • acinclude.m4

    r87a95526 r7a928017  
    44## ${BUILD_CONFIGDIRS_LIST} is directories we build using the build tools
    55
     6AC_PREREQ(2.57)
    67
    78dnl RTEMS_ARG_VAR(VAR,HELP-STRING)
    … …  
    4344AC_CONFIG_COMMANDS_PRE([
    4445
    45 test -z "$host_alias" && host_alias="$host"
    46 test -z "$build_alias" && build_alias="$build"
    47 test -z "$target_alias" && target_alias="$target"
     46if test -z "${build_alias}"; then
     47# build_alias is empty
     48  if test -z "${host_alias}"; then
     49  # host_alias is empty
     50    if test -z "${target_alias}"; then
     51    : target_alias is empty
     52    else
     53    : target_alias is not empty
     54    fi
     55  else
     56  # host_alias is not empty
     57    if test -z "${target_alias}"; then
     58    : target_alias is empty
     59    target_alias="${host_alias}"
     60    else
     61    : target_alias is not empty
     62    fi
     63  fi
     64else
     65# build_alias is not empty
     66  if test -z "${host_alias}"; then
     67  # host_alias is empty
     68    if test -z "${target_alias}"; then
     69    : target_alias is empty
     70    else
     71    : target_alias is not empty
     72    fi
     73  else
     74  # host_alias is not empty
     75    if test -z "${target_alias}"; then
     76    : target_alias is empty
     77    target_alias="${host_alias}"
     78    else
     79    : target_alias is not empty
     80    fi
     81  fi
     82fi
    4883
    4984_RTEMS_BUILD_CONFIG_PREPARE
    … …  
    5186_RTEMS_TARGET_CONFIG_PREPARE
    5287
     88build_subdir="."
    5389build_SUBDIRS="${build_configdirs}"
    5490build_configdirs="${build_configdirs}"
    5591
    56 AS_IF([test $build = $host],
     92AS_IF([test $build != $host],
    5793[dnl
    58   AS_IF([test $host = $target],
    59   [dnl b=h, h=t, t=b
    60     host_SUBDIRS="${host_configdirs}"
    61     host_configdirs="${host_configdirs}"
    62     target_SUBDIRS="${target_configdirs}"
    63     target_configdirs="${target_configdirs}"],
    64   [dnl b=h, h!=t, t!=b
    65     host_SUBDIRS="${host_configdirs}"
    66     host_configdirs="${host_configdirs}"
    67     target_SUBDIRS=`echo "${target_configdirs}" | \
    68       sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
    69     target_configdirs="${target_configdirs}"
    70   ])
     94  host_subdir="${host_alias-$host}"
     95  host_SUBDIRS=`echo "${host_configdirs}" | \
     96        sed -e "s%\([[^ ]][[^ ]]*\)%$host_subdir/\1%g"`
     97  host_configdirs="${host_configdirs}"
    7198],[dnl
    72   AS_IF([test $host = $target],
    73   [ dnl b!=h, h=t, b!=t
    74     host_SUBDIRS=`echo "${host_configdirs}" | \
    75       sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
    76     host_configdirs="${host_configdirs}"
    77     AS_IF([test x"$enable_experimental" = x"yes" ],[
    78       target_SUBDIRS=`echo "${target_configdirs}" | \
    79         sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
    80       target_configdirs="${target_configdirs}"
    81     ])
    82   ],[dnl
    83     AS_IF([test $build = $target],
    84     [dnl b!=h, h!=t, b=t
    85       host_SUBDIRS=`echo "${host_configdirs}" | \
    86         sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
    87       host_configdirs="${host_configdirs}"
    88       AS_IF([test x"$enable_experimental" = x"yes" ],[
    89         target_SUBDIRS="${target_configdirs}"
    90         target_configdirs="${target_configdirs}"
    91       ])
    92     ],[dnl b!=h, h!=t, b!=t
    93       host_SUBDIRS=`echo "${host_configdirs}" | \
    94         sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
    95       host_configdirs="${host_configdirs}"
    96       AS_IF([test x"$enable_experimental" = x"yes" ],[
    97         target_SUBDIRS=`echo "${target_configdirs}" | \
    98           sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
    99         target_configdirs="${target_configdirs}"
    100       ])
    101     ])
    102   ])
     99  host_SUBDIRS="${host_configdirs}"
     100  host_configdirs="${host_configdirs}"
     101])
     102
     103AS_IF([test $build != $target],
     104[dnl
     105  target_subdir="${target_alias-$target}"
     106  target_SUBDIRS=`echo "${target_configdirs}" | \
     107      sed -e "s%\([[^ ]][[^ ]]*\)%$target_subdir/\1%g"`
     108  target_configdirs="${target_configdirs}"
     109],[dnl
     110  target_SUBDIRS="${target_configdirs}"
     111  target_configdirs="${target_configdirs}"
    103112])
    104113
    … …  
    331340m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([buildargs])])
    332341eval buildargs_prune $ac_configure_args
    333 buildargs="'--host=${build}' '--build=${build}' ${buildargs}"
    334 test -n "${target_alias}" && \
    335 buildargs="${buildargs} --target='${target_alias}'"
    336 build_subdir="."
     342buildargs="'--host=${build_alias-$build}' '--build=${build_alias-$build}' ${buildargs}"
     343buildargs="${buildargs} '--target=${target_alias-$target}'"
    337344],[])
     345AC_SUBST(buildargs)
     346AC_SUBST(build_subdir)
    338347])
    339348
    … …  
    356365m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([hostargs])])
    357366eval hostargs_prune $ac_configure_args
    358 hostargs="'--host=${host_alias}' '--build=${build}' '--target=${target_alias}' ${hostargs}"
    359 host_subdir="${host_alias}"
     367hostargs="'--host=${host_alias-$host}' '--build=${build_alias-$build}' '--target=${target_alias-$target}' ${hostargs}"
    360368],[])
     369AC_SUBST(hostargs)
     370AC_SUBST(host_subdir)
    361371])
    362372
    … …  
    379389m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([targetargs])])
    380390eval targetargs_prune $ac_configure_args
    381 targetargs="'--host=${target_alias}' '--build=${build}' '--target=${target_alias}' ${targetargs}"
    382 target_subdir="${target_alias}"
     391targetargs="'--host=${target_alias-$target}' '--build=${build_alias-$build}' '--target=${target_alias-$target}' ${targetargs}"
    383392],[])
    384 ])
     393AC_SUBST(targetargs)
     394AC_SUBST(target_subdir)
     395])

  • aclocal/prog-cc.m4

    r87a95526 r7a928017  
    2727dnl check target cc
    2828RTEMS_PROG_CC
    29 dnl check if the compiler supports --specs
    30 RTEMS_GCC_SPECS
     29dnl check if the compiler supports -isystem
     30RTEMS_GCC_ISYSTEM
    3131dnl check if the target compiler may use --pipe
    3232RTEMS_GCC_PIPE
    3333test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe"
     34
     35dnl check if the compiler supports --specs
     36RTEMS_GCC_SPECS
    3437
    3538if test "$GCC" = yes; then
    … …  
    3740m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"])
    3841fi
     42
     43AS_IF([test x"$rtems_cv_gcc_isystem" = x"yes"],[
     44  RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"],[
     45  RTEMS_CPPFLAGS="-I\$(PROJECT_INCLUDE)"
    3946])
     47AC_SUBST(RTEMS_CPPFLAGS)
     48])

  • configure.ac

    r87a95526 r7a928017  
    3838    (default:disabled)])])
    3939
    40 if test $host != $build; then
    41 AC_MSG_WARN([]
    42 [*** *** *** WARNING *** *** ***]
    43 []
    44 [Entering BEYOND BLEEDING EDGE TERRITORY]
    45 []
    46 [You are trying to build RTEMS Canadian cross]
    47 [If you really mean it, feel free to continue ...]
    48 [*** *** *** *** *** *** *** ***])
    49 fi
    50 
    5140## NOTES:
    5241## * tools/build are host-native tools to be installed on the host.
    … …  
    6251
    6352AS_IF([test x"${enable_docs}" = x"yes"],
    64   [RTEMS_HOST_CONFIG_SUBDIRS([doc])])
     53  [RTEMS_BUILD_CONFIG_SUBDIRS([doc])])
    6554
    6655AS_IF([test x"$enable_multilib" = x"yes"],[
Note: See TracChangeset for help on using the changeset viewer.