Don't switch on -shared if the user specifies -r.

* Follow up to btrev43090, to include platforms missed in
  original commit.