 +  # Sadly, this has to be kept in line with the rules in libtool.m4.
 +  # This make fragment will override the setting in t-slibgcc-darwin so it
 +  # must appear after it.
-+  if test "x$enable_darwin_at_rpath" = "xyes"; then
-+    tmake_file="$tmake_file t-darwin-rpath "
-+  elif test "x$enable_darwin_at_rpath" = "x"; then
++  if test "x$enable_darwin_at_rpath" = "x"; then
 +    echo "enable_darwin_at_rpath is unset" 1>&2
 +    case ${host} in
 +      *-darwin[45678]*) ;;
 +      *-darwin9* | *-darwin1[01234]*) ;; # We might default these on later.
 +      *-darwin*)
 +        echo "but is needed after macOS 10.11 (setting it on)" 1>&2
-+        tmake_file="$tmake_file t-darwin-rpath "
 +        enable_darwin_at_rpath=yes
 +        ;;
 +    esac
 +  else
 +    echo "enable_darwin_at_rpath is '$enable_darwin_at_rpath'" 1>&2
++  fi
++  if test "x$enable_darwin_at_rpath" = "xyes"; then
++    tmake_file="$tmake_file t-darwin-rpath "
 +  fi
 +  case ${host} in
 +    *-*-darwin2* | *-*-darwin1[89]* | aarch64*-*-darwin*)

 	default:
 	  break;
 	}
@@ -372,6 +394,9 @@ darwin_driver_init (unsigned int *decoded_options_count,
   if (seenPPC || seenPPC64)
     warning (0, "this compiler does not support PowerPC"
 		" (%<-arch%> option ignored)");

 
 	case OPT_mmacosx_version_min_:
 	  seen_version_min = true;
@@ -355,8 +363,16 @@ darwin_driver_init (unsigned int *decoded_options_count,
 	  gcc_checking_assert ((*decoded_options)[i].arg);
 	  if (startswith ((*decoded_options)[i].arg, "-exported_symbol"))
 	    noexport_p = false;
