From b15a9f630075b2564ff5e15a19c2ad094ef19080 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 14 Jun 2008 09:53:00 +0000 Subject: [PATCH] configure.ac: Update gthr-default.h lazily, to avoid unneeded library rebuilds. gcc/ * configure.ac: Update gthr-default.h lazily, to avoid unneeded library rebuilds. * configure: Regenerate. From-SVN: r136780 --- gcc/ChangeLog | 6 ++++++ gcc/configure | 36 ++++++++++++++++++++---------------- gcc/configure.ac | 8 ++++++-- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6d20774cb1f..4a6e9023f4e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-06-14 Ralf Wildenhues + + * configure.ac: Update gthr-default.h lazily, to avoid unneeded + library rebuilds. + * configure: Regenerate. + 2008-06-13 Eric Botcazou PR middle-end/36520 diff --git a/gcc/configure b/gcc/configure index 1d16aa0f689..4a58626d2a7 100755 --- a/gcc/configure +++ b/gcc/configure @@ -13253,8 +13253,12 @@ fi # Make gthr-default.h if we have a thread file. gthread_flags= if test $thread_file != single; then - rm -f gthr-default.h - echo "#include \"gthr-${thread_file}.h\"" > gthr-default.h + echo "#include \"gthr-${thread_file}.h\"" > gthr-default.h-t + if diff gthr-default.h-t gthr-default.h 2>/dev/null; then + rm -f gthr-default.h-t + else + mv -f gthr-default.h-t gthr-default.h + fi gthread_flags=-DHAVE_GTHR_DEFAULT fi @@ -14666,13 +14670,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:14669: $ac_compile\"" >&5) + (eval echo "\"\$as_me:14673: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:14672: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:14676: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:14675: output\"" >&5) + (eval echo "\"\$as_me:14679: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -15727,7 +15731,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 15730 "configure"' > conftest.$ac_ext + echo '#line 15734 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -16347,11 +16351,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16350: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16354: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16354: \$? = $ac_status" >&5 + echo "$as_me:16358: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16669,11 +16673,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16672: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16676: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16676: \$? = $ac_status" >&5 + echo "$as_me:16680: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16774,11 +16778,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16777: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16781: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16781: \$? = $ac_status" >&5 + echo "$as_me:16785: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16829,11 +16833,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16832: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16836: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16836: \$? = $ac_status" >&5 + echo "$as_me:16840: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19626,7 +19630,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19629 "configure" +#line 19633 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19726,7 +19730,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19729 "configure" +#line 19733 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 49dcf34a6dd..6bca2954e38 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1368,8 +1368,12 @@ fi # Make gthr-default.h if we have a thread file. gthread_flags= if test $thread_file != single; then - rm -f gthr-default.h - echo "#include \"gthr-${thread_file}.h\"" > gthr-default.h + echo "#include \"gthr-${thread_file}.h\"" > gthr-default.h-t + if diff gthr-default.h-t gthr-default.h 2>/dev/null; then + rm -f gthr-default.h-t + else + mv -f gthr-default.h-t gthr-default.h + fi gthread_flags=-DHAVE_GTHR_DEFAULT fi AC_SUBST(gthread_flags) -- 2.30.2