Bootstrapped

diff --git a/configure b/configure
index b290438cba447b186410223b64d8d26a48dfd382..f9bf20967db90608fa0da49ba59878b8594c8528 100755 (executable)
--- a/configure
+++ b/configure
@@ -21229,6 +21229,7 @@ if test $needlargefiles && test -z "$buildmodel"; then
                echo "WARNING: No suitable build environment found for large files. Trying to use _FILE_OFFSET_BITS=64"
                sleep 1
                CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
+               CXXFLAGS="-D_FILE_OFFSET_BITS=64 $CXXFLAGS"
        fi
 fi
 if test -n "$buildmodel" && test "$buildmodel" != "default"; then
@@ -21240,6 +21241,7 @@ if test -n "$buildmodel" && test "$buildmodel" != "default"; then
            exit 1
        fi
        CFLAGS="`getconf ${buildmodel}_CFLAGS` $CFLAGS"
+       CXXFLAGS="`getconf ${buildmodel}_CFLAGS` $CXXFLAGS"
        LIBS="`getconf ${buildmodel}_LIBS` $LIBS"
        LDFLAGS="`getconf ${buildmodel}_LDFLAGS` $LDFLAGS"
        case "$host" in
@@ -21247,9 +21249,11 @@ if test -n "$buildmodel" && test "$buildmodel" != "default"; then
                if test "$GCC" = "yes"; then
                    echo "Removing -Xa for gcc on $host"
                    CFLAGS="`echo $CFLAGS | sed -e 's/-Xa//'`"
+                   CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-Xa//'`"
                fi
                echo "Removing -Usun for gcc on $host"
                CFLAGS="`echo $CFLAGS | sed -e 's/-Usun//'`"
+               CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-Usun//'`"
                ;;
            *)
                ;;