  		   (*decoded_options)[i].arg);
  	  /* Now we've examined it, drop the -arch arg.  */
  	  if (*decoded_options_count > i) {
-@@ -315,7 +328,7 @@ darwin_driver_init (unsigned int *decoded_options_count,
+@@ -315,7 +321,7 @@ darwin_driver_init (unsigned int *decoded_options_count,
  	  --i;
  	  --*decoded_options_count; 
  	  break;

+    # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use
+    # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key
+    # system executables (e.g. /bin/sh).  Force rpaths on for these systems.
+      UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[12].*[,.]* )
+      echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5
+      enable_darwin_at_rpath=yes
+      ;;

+    # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use
+    # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key
+    # system executables (e.g. /bin/sh).  Force rpaths on for these systems.
+      UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* )
+      echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5
+      enable_darwin_at_rpath=yes
+      ;;
