make/autoconf/flags.m4

rev 52912 : 8160926: FLAGS_COMPILER_CHECK_ARGUMENTS doesn't handle cross-compilation
Reviewed-by: ihse, andrew

*** 414,434 ****
  # FLAGS_C_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARGUMENT], IF_TRUE: [RUN-IF-TRUE],
  #                                  IF_FALSE: [RUN-IF-FALSE])
  # ------------------------------------------------------------
  # Check that the C compiler supports an argument
  BASIC_DEFUN_NAMED([FLAGS_C_COMPILER_CHECK_ARGUMENTS],
!     [*ARGUMENT IF_TRUE IF_FALSE], [$@],
  [
!   AC_MSG_CHECKING([if the C compiler supports "ARG_ARGUMENT"])
    supports=yes
  
    saved_cflags="$CFLAGS"
    CFLAGS="$CFLAGS ARG_ARGUMENT"
    AC_LANG_PUSH([C])
    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
        [supports=no])
    AC_LANG_POP([C])
    CFLAGS="$saved_cflags"
  
    AC_MSG_RESULT([$supports])
    if test "x$supports" = "xyes" ; then
      :
--- 414,437 ----
  # FLAGS_C_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARGUMENT], IF_TRUE: [RUN-IF-TRUE],
  #                                  IF_FALSE: [RUN-IF-FALSE])
  # ------------------------------------------------------------
  # Check that the C compiler supports an argument
  BASIC_DEFUN_NAMED([FLAGS_C_COMPILER_CHECK_ARGUMENTS],
!     [*ARGUMENT IF_TRUE IF_FALSE PREFIX], [$@],
  [
!   AC_MSG_CHECKING([if ARG_PREFIX[CC] supports "ARG_ARGUMENT"])
    supports=yes
  
    saved_cflags="$CFLAGS"
+   saved_cc="$CC"
    CFLAGS="$CFLAGS ARG_ARGUMENT"
+   CC="$ARG_PREFIX[CC]"
    AC_LANG_PUSH([C])
    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
        [supports=no])
    AC_LANG_POP([C])
+   CC="$saved_cc"
    CFLAGS="$saved_cflags"
  
    AC_MSG_RESULT([$supports])
    if test "x$supports" = "xyes" ; then
      :
*** 442,462 ****
  # FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARGUMENT], IF_TRUE: [RUN-IF-TRUE],
  #                                    IF_FALSE: [RUN-IF-FALSE])
  # ------------------------------------------------------------
  # Check that the C++ compiler supports an argument
  BASIC_DEFUN_NAMED([FLAGS_CXX_COMPILER_CHECK_ARGUMENTS],
!     [*ARGUMENT IF_TRUE IF_FALSE], [$@],
  [
!   AC_MSG_CHECKING([if the C++ compiler supports "ARG_ARGUMENT"])
    supports=yes
  
    saved_cxxflags="$CXXFLAGS"
    CXXFLAGS="$CXXFLAG ARG_ARGUMENT"
    AC_LANG_PUSH([C++])
    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
        [supports=no])
    AC_LANG_POP([C++])
    CXXFLAGS="$saved_cxxflags"
  
    AC_MSG_RESULT([$supports])
    if test "x$supports" = "xyes" ; then
      :
--- 445,468 ----
  # FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARGUMENT], IF_TRUE: [RUN-IF-TRUE],
  #                                    IF_FALSE: [RUN-IF-FALSE])
  # ------------------------------------------------------------
  # Check that the C++ compiler supports an argument
  BASIC_DEFUN_NAMED([FLAGS_CXX_COMPILER_CHECK_ARGUMENTS],
!     [*ARGUMENT IF_TRUE IF_FALSE PREFIX], [$@],
  [
!   AC_MSG_CHECKING([if ARG_PREFIX[CXX] supports "ARG_ARGUMENT"])
    supports=yes
  
    saved_cxxflags="$CXXFLAGS"
+   saved_cxx="$CXX"
    CXXFLAGS="$CXXFLAG ARG_ARGUMENT"
+   CXX="$ARG_PREFIX[CXX]"
    AC_LANG_PUSH([C++])
    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
        [supports=no])
    AC_LANG_POP([C++])
+   CXX="$saved_cxx"
    CXXFLAGS="$saved_cxxflags"
  
    AC_MSG_RESULT([$supports])
    if test "x$supports" = "xyes" ; then
      :
*** 470,491 ****
  # FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARGUMENT], IF_TRUE: [RUN-IF-TRUE],
  #                                IF_FALSE: [RUN-IF-FALSE])
  # ------------------------------------------------------------
  # Check that the C and C++ compilers support an argument
  BASIC_DEFUN_NAMED([FLAGS_COMPILER_CHECK_ARGUMENTS],
!     [*ARGUMENT IF_TRUE IF_FALSE], [$@],
  [
    FLAGS_C_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
                                               IF_TRUE: [C_COMP_SUPPORTS="yes"],
!                                              IF_FALSE: [C_COMP_SUPPORTS="no"])
    FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
                                                 IF_TRUE: [CXX_COMP_SUPPORTS="yes"],
!                                                IF_FALSE: [CXX_COMP_SUPPORTS="no"])
  
!   AC_MSG_CHECKING([if both compilers support "ARG_ARGUMENT"])
    supports=no
!   if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
  
    AC_MSG_RESULT([$supports])
    if test "x$supports" = "xyes" ; then
      :
      ARG_IF_TRUE
--- 476,501 ----
  # FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARGUMENT], IF_TRUE: [RUN-IF-TRUE],
  #                                IF_FALSE: [RUN-IF-FALSE])
  # ------------------------------------------------------------
  # Check that the C and C++ compilers support an argument
  BASIC_DEFUN_NAMED([FLAGS_COMPILER_CHECK_ARGUMENTS],
!     [*ARGUMENT IF_TRUE IF_FALSE PREFIX], [$@],
  [
    FLAGS_C_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
        IF_TRUE: [C_COMP_SUPPORTS="yes"],
!       IF_FALSE: [C_COMP_SUPPORTS="no"],
!       PREFIX: [ARG_PREFIX])
    FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
        IF_TRUE: [CXX_COMP_SUPPORTS="yes"],
!       IF_FALSE: [CXX_COMP_SUPPORTS="no"],
!       PREFIX: [ARG_PREFIX])
  
!   AC_MSG_CHECKING([if both ARG_PREFIX[CC] and ARG_PREFIX[CXX] support "ARG_ARGUMENT"])
    supports=no
!   if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then
!     supports=yes;
!   fi
  
    AC_MSG_RESULT([$supports])
    if test "x$supports" = "xyes" ; then
      :
      ARG_IF_TRUE