diff options
| author | Eric Christopher <echristo@apple.com> | 2010-03-02 05:06:54 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2010-03-02 05:06:54 +0000 |
| commit | c77185038014298580d71daed6284b9a94b70f5b (patch) | |
| tree | 1153e756ec11b6130900f7c22ff6c41d918c1e5a | |
| parent | 7b2c9e6a30530b6c4496f3a511f9d821ecb83b69 (diff) | |
| download | llvm-c77185038014298580d71daed6284b9a94b70f5b.tar.gz llvm-c77185038014298580d71daed6284b9a94b70f5b.tar.bz2 llvm-c77185038014298580d71daed6284b9a94b70f5b.tar.xz | |
Make sure we save CXXFLAGS before setting it as pedantic and regenerate
configure.
Fixes PR6388.
Patch by Yann Droneaud!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97548 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | autoconf/m4/huge_val.m4 | 2 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/autoconf/m4/huge_val.m4 b/autoconf/m4/huge_val.m4 index fd94c11c86..5fffbfc8d3 100644 --- a/autoconf/m4/huge_val.m4 +++ b/autoconf/m4/huge_val.m4 @@ -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 @@ AC_DEFUN([AC_HUGE_VAL_CHECK],[ [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) @@ -16544,6 +16544,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 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 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$a fi + CXXFLAGS=$ac_save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |