diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2015-05-31 12:06:06 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2015-05-31 05:06:06 -0700 |
| commit | fee22a8053fb34a220f6bcc6bec6b016fe248696 (patch) | |
| tree | 1cbbee948ee635677ff08a5c35349685f793c568 | |
| parent | 60b92097175e4bd51b89152e619fcace09b6c9d9 (diff) | |
| download | gcc-fee22a8053fb34a220f6bcc6bec6b016fe248696.zip gcc-fee22a8053fb34a220f6bcc6bec6b016fe248696.tar.gz gcc-fee22a8053fb34a220f6bcc6bec6b016fe248696.tar.bz2 | |
Check CXXFLAGS, instead of CFLAGS, for NO_PIE_CFLAGS
* configure.ac (NO_PIE_CFLAGS): Check CXXFLAGS instead of CFLAGS.
* configure: Regenerated.
From-SVN: r223899
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rwxr-xr-x | gcc/configure | 6 | ||||
| -rw-r--r-- | gcc/configure.ac | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5625750..0394d19 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-05-31 H.J. Lu <hongjiu.lu@intel.com> + + * configure.ac (NO_PIE_CFLAGS): Check CXXFLAGS instead of CFLAGS. + * configure: Regenerated. + 2015-05-31 Mikhail Maltsev <maltsevm@gmail.com> * config/cris/cris.h (CRIS_ARCH_CPP_DEFAULT): Fix C++11 compatibility diff --git a/gcc/configure b/gcc/configure index f70f2d3..b26a86f 100755 --- a/gcc/configure +++ b/gcc/configure @@ -28728,8 +28728,8 @@ $as_echo_n "checking for -fno-PIE option... " >&6; } if test "${gcc_cv_c_no_fpie+set}" = set; then : $as_echo_n "(cached) " >&6 else - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-PIE" + saved_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fno-PIE" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(void) {return 0;} @@ -28740,7 +28740,7 @@ else gcc_cv_c_no_fpie=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$saved_CFLAGS" + CXXFLAGS="$saved_CXXFLAGS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_c_no_fpie" >&5 $as_echo "$gcc_cv_c_no_fpie" >&6; } diff --git a/gcc/configure.ac b/gcc/configure.ac index b27433e..c09f3ae5 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5834,12 +5834,12 @@ AC_SUBST([enable_default_pie]) # Check if -fno-PIE works. AC_CACHE_CHECK([for -fno-PIE option], [gcc_cv_c_no_fpie], - [saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-PIE" + [saved_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fno-PIE" AC_COMPILE_IFELSE([int main(void) {return 0;}], [gcc_cv_c_no_fpie=yes], [gcc_cv_c_no_fpie=no]) - CFLAGS="$saved_CFLAGS"]) + CXXFLAGS="$saved_CXXFLAGS"]) if test "$gcc_cv_c_no_fpie" = "yes"; then NO_PIE_CFLAGS="-fno-PIE" fi |