configure: Account CXXFLAGS in gcc-plugin.m4.
authorIain Sandoe <iain@sandoe.co.uk>
Wed, 8 Dec 2021 20:58:34 +0000 (20:58 +0000)
committerIain Sandoe <iain@sandoe.co.uk>
Wed, 15 Dec 2021 14:49:59 +0000 (14:49 +0000)
We now use a C++ compiler so that we need to process
CXXFLAGS as well as CFLAGS in the gcc-plugin config
fragment.

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
config/ChangeLog:

* gcc-plugin.m4: Save and process CXXFLAGS.

gcc/ChangeLog:

* configure: Regenerate.

libcc1/ChangeLog:

* configure: Regenerate.

config/gcc-plugin.m4
gcc/configure
libcc1/configure

index 8f27871..7ee342f 100644 (file)
@@ -91,14 +91,18 @@ AC_DEFUN([GCC_ENABLE_PLUGINS],
      # Check that we can build shared objects with -fPIC -shared
      saved_LDFLAGS="$LDFLAGS"
      saved_CFLAGS="$CFLAGS"
+     saved_CXXFLAGS="$CXXFLAGS"
      case "${host}" in
        *-*-darwin*)
         CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
         CFLAGS="$CFLAGS -fPIC"
+        CXXFLAGS=`echo $CXXFLAGS | sed s/-mdynamic-no-pic//g`
+        CXXFLAGS="$CXXFLAGS -fPIC"
         LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
        ;;
        *)
         CFLAGS="$CFLAGS -fPIC"
+        CXXFLAGS="$CXXFLAGS -fPIC"
         LDFLAGS="$LDFLAGS -fPIC -shared"
        ;;
      esac
@@ -113,6 +117,7 @@ AC_DEFUN([GCC_ENABLE_PLUGINS],
      fi
      LDFLAGS="$saved_LDFLAGS"
      CFLAGS="$saved_CFLAGS"
+     CXXFLAGS="$saved_CXXFLAGS"
 
      # If plugin support had been requested but not available, fail.
      if test x"$enable_plugin" = x"no" ; then
index de20e5d..5470987 100755 (executable)
      # Check that we can build shared objects with -fPIC -shared
      saved_LDFLAGS="$LDFLAGS"
      saved_CFLAGS="$CFLAGS"
+     saved_CXXFLAGS="$CXXFLAGS"
      case "${host}" in
        *-*-darwin*)
         CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
         CFLAGS="$CFLAGS -fPIC"
+        CXXFLAGS=`echo $CXXFLAGS | sed s/-mdynamic-no-pic//g`
+        CXXFLAGS="$CXXFLAGS -fPIC"
         LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
        ;;
        *)
         CFLAGS="$CFLAGS -fPIC"
+        CXXFLAGS="$CXXFLAGS -fPIC"
         LDFLAGS="$LDFLAGS -fPIC -shared"
        ;;
      esac
@@ -32077,6 +32081,7 @@ rm -f core conftest.err conftest.$ac_objext \
      fi
      LDFLAGS="$saved_LDFLAGS"
      CFLAGS="$saved_CFLAGS"
+     CXXFLAGS="$saved_CXXFLAGS"
 
      # If plugin support had been requested but not available, fail.
      if test x"$enable_plugin" = x"no" ; then
index b198b0b..01cfb28 100755 (executable)
      # Check that we can build shared objects with -fPIC -shared
      saved_LDFLAGS="$LDFLAGS"
      saved_CFLAGS="$CFLAGS"
+     saved_CXXFLAGS="$CXXFLAGS"
      case "${host}" in
        *-*-darwin*)
         CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
         CFLAGS="$CFLAGS -fPIC"
+        CXXFLAGS=`echo $CXXFLAGS | sed s/-mdynamic-no-pic//g`
+        CXXFLAGS="$CXXFLAGS -fPIC"
         LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
        ;;
        *)
         CFLAGS="$CFLAGS -fPIC"
+        CXXFLAGS="$CXXFLAGS -fPIC"
         LDFLAGS="$LDFLAGS -fPIC -shared"
        ;;
      esac
@@ -15180,6 +15184,7 @@ rm -f core conftest.err conftest.$ac_objext \
      fi
      LDFLAGS="$saved_LDFLAGS"
      CFLAGS="$saved_CFLAGS"
+     CXXFLAGS="$saved_CXXFLAGS"
 
      # If plugin support had been requested but not available, fail.
      if test x"$enable_plugin" = x"no" ; then