diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2d0e649daa8..07516816bb1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-08-19 H.J. Lu + + PR other/62168 + * configure.ac: Set install_gold_as_default to no first. + * configure: Regenerated. + 2014-08-19 David Malcolm * sel-sched-ir.h (BB_NOTE_LIST): struct sel_region_bb_info_def's diff --git a/gcc/configure b/gcc/configure index 60aaea17d27..fc78f427c26 100755 --- a/gcc/configure +++ b/gcc/configure @@ -21528,6 +21528,7 @@ if test "${enable_ld+set}" = set; then : fi +install_gold_as_default=no # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in @@ -21540,14 +21541,11 @@ if test "${enable_gold+set}" = set; then : fi ;; no) - install_gold_as_default=no ;; *) as_fn_error "invalid --enable-gold argument" "$LINENO" 5 ;; esac -else - install_gold_as_default=no fi diff --git a/gcc/configure.ac b/gcc/configure.ac index b5c05ab0f11..c7f0e6a122f 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2082,6 +2082,7 @@ AC_ARG_ENABLE(ld, ;; esac]) +install_gold_as_default=no AC_ARG_ENABLE(gold, [[ --enable-gold[=ARG] build gold [ARG={default,yes,no}]]], [case "${enableval}" in @@ -2094,13 +2095,11 @@ AC_ARG_ENABLE(gold, fi ;; no) - install_gold_as_default=no ;; *) AC_MSG_ERROR([invalid --enable-gold argument]) ;; - esac], -[install_gold_as_default=no]) + esac]) # Identify the linker which will work hand-in-glove with the newly # built GCC, so that we can examine its features. This is the linker