diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-09-13 09:43:29 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-09-13 09:43:29 +0200 |
| commit | 54de7d7dd08a28f1783ee7c99bf57b5ac93614ef (patch) | |
| tree | 8f032f7ff7b8acfbf449e1721582f0bf80f6adcb | |
| parent | d51232fb3bd02f8862478fe5f1a7b0fa6751b573 (diff) | |
| download | gcc-54de7d7dd08a28f1783ee7c99bf57b5ac93614ef.zip gcc-54de7d7dd08a28f1783ee7c99bf57b5ac93614ef.tar.gz gcc-54de7d7dd08a28f1783ee7c99bf57b5ac93614ef.tar.bz2 | |
configure.ac: Only append " ...
* configure.ac: Only append
" : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS" to
gcc_config_arguments if it was never reconfigured or last reconfigure
was with different arguments.
* configure: Regenerated.
From-SVN: r264262
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rwxr-xr-x | gcc/configure | 17 | ||||
| -rw-r--r-- | gcc/configure.ac | 5 |
3 files changed, 22 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a9a3d39..99493e4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,4 +1,12 @@ 2018-09-13 Jakub Jelinek <jakub@redhat.com> + + * configure.ac: Only append + " : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS" to + gcc_config_arguments if it was never reconfigured or last reconfigure + was with different arguments. + * configure: Regenerated. + +2018-09-13 Jakub Jelinek <jakub@redhat.com> Kyrylo Tkachov <kyrylo.tkachov@arm.com> PR middle-end/87290 diff --git a/gcc/configure b/gcc/configure index b7a8e36..5ae43ec 100755 --- a/gcc/configure +++ b/gcc/configure @@ -11836,7 +11836,10 @@ xm_file="auto-host.h ansidecl.h ${xm_file}" if test -f configargs.h ; then # Being re-configured. gcc_config_arguments=`grep configuration_arguments configargs.h | sed -e 's/.*"\([^"]*\)".*/\1/'` - gcc_config_arguments="$gcc_config_arguments : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS" + gcc_reconf_arguments=`echo "$gcc_config_arguments" | sed -e 's/^.*\( : (reconfigured) .*$\)/\1/'` + if [ "$gcc_reconf_arguments" != " : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS" ]; then + gcc_config_arguments="$gcc_config_arguments : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS" + fi else gcc_config_arguments="$TOPLEVEL_CONFIGURE_ARGUMENTS" fi @@ -18460,7 +18463,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18463 "configure" +#line 18466 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18566,7 +18569,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18569 "configure" +#line 18572 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19731,20 +19734,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' diff --git a/gcc/configure.ac b/gcc/configure.ac index 65f9c92..fceab2f 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1744,7 +1744,10 @@ changequote(,)dnl if test -f configargs.h ; then # Being re-configured. gcc_config_arguments=`grep configuration_arguments configargs.h | sed -e 's/.*"\([^"]*\)".*/\1/'` - gcc_config_arguments="$gcc_config_arguments : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS" + gcc_reconf_arguments=`echo "$gcc_config_arguments" | sed -e 's/^.*\( : (reconfigured) .*$\)/\1/'` + if [ "$gcc_reconf_arguments" != " : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS" ]; then + gcc_config_arguments="$gcc_config_arguments : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS" + fi else gcc_config_arguments="$TOPLEVEL_CONFIGURE_ARGUMENTS" fi |