[llvm-commits] [llvm] r97548 - in /llvm/trunk: autoconf/m4/huge_val.m4 configure

[Eric Christopher]

Author: echristo
Date: Mon Mar  1 23:06:54 2010
New Revision: 97548

URL: http://llvm.org/viewvc/llvm-project?rev=97548&view=rev
Log:
Make sure we save CXXFLAGS before setting it as pedantic and regenerate
configure.

Fixes PR6388.

Patch by Yann Droneaud!

Modified:
    llvm/trunk/autoconf/m4/huge_val.m4
    llvm/trunk/configure

Modified: llvm/trunk/autoconf/m4/huge_val.m4
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/m4/huge_val.m4?rev=97548&r1=97547&r2=97548&view=diff
==============================================================================
--- llvm/trunk/autoconf/m4/huge_val.m4 (original)
+++ llvm/trunk/autoconf/m4/huge_val.m4 Mon Mar  1 23:06:54 2010
@@ -5,6 +5,7 @@
 AC_DEFUN([AC_HUGE_VAL_CHECK],[
   AC_CACHE_CHECK([for HUGE_VAL sanity], [ac_cv_huge_val_sanity],[
     AC_LANG_PUSH([C++])
+    ac_save_CXXFLAGS=$CXXFLAGS
     CXXFLAGS=-pedantic
     AC_RUN_IFELSE(
       AC_LANG_PROGRAM(
@@ -12,6 +13,7 @@
         [double x = HUGE_VAL; return x != x; ]),
       [ac_cv_huge_val_sanity=yes],[ac_cv_huge_val_sanity=no],
       [ac_cv_huge_val_sanity=yes])
+    CXXFLAGS=$ac_save_CXXFLAGS
     AC_LANG_POP([C++])
     ])
   AC_SUBST(HUGE_VAL_SANITY,$ac_cv_huge_val_sanity)

Modified: llvm/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=97548&r1=97547&r2=97548&view=diff
==============================================================================
--- llvm/trunk/configure (original)
+++ llvm/trunk/configure Mon Mar  1 23:06:54 2010
@@ -16544,6 +16544,7 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+    ac_save_CXXFLAGS=$CXXFLAGS
     CXXFLAGS=-pedantic
     if test "$cross_compiling" = yes; then
   ac_cv_huge_val_sanity=yes
@@ -16596,6 +16597,7 @@
 fi
 
 
+    CXXFLAGS=$ac_save_CXXFLAGS
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'