diff --git a/lib/std/build.zig b/lib/std/build.zig
index c018397ffa..0a6c765487 100644
--- a/lib/std/build.zig
+++ b/lib/std/build.zig
@@ -1487,6 +1487,7 @@ pub const LibExeObjStep = struct {
     libc_file: ?FileSource = null,
 
     valgrind_support: ?bool = null,
+    each_lib_rpath: ?bool = null,
 
     /// Create a .eh_frame_hdr section and a PT_GNU_EH_FRAME segment in the ELF
     /// file.
@@ -2681,6 +2682,14 @@ pub const LibExeObjStep = struct {
             }
         }
 
+        if (self.each_lib_rpath) |each_lib_rpath| {
+            if (each_lib_rpath) {
+                try zig_args.append("-feach-lib-rpath");
+            } else {
+                try zig_args.append("-fno-each-lib-rpath");
+            }
+        }
+
         if (self.override_lib_dir) |dir| {
             try zig_args.append("--zig-lib-dir");
             try zig_args.append(builder.pathFromRoot(dir));