summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorEric Christopher <echristo@apple.com>2010-03-02 05:06:54 +0000
committerEric Christopher <echristo@apple.com>2010-03-02 05:06:54 +0000
commitc77185038014298580d71daed6284b9a94b70f5b (patch)
tree1153e756ec11b6130900f7c22ff6c41d918c1e5a /configure
parent7b2c9e6a30530b6c4496f3a511f9d821ecb83b69 (diff)
downloadllvm-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
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index 62b8fc9b39..b3f16034cb 100755
--- a/configure
+++ b/configure
@@ -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'