diff --git a/.pick_status.json b/.pick_status.json
index a0d05ef4b82..b3a641a76dd 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6474,7 +6474,7 @@
         "description": "rusticl: link the C++ runtime statically",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build
index 2b214adbbf5..d4a24fd8585 100644
--- a/src/gallium/targets/rusticl/meson.build
+++ b/src/gallium/targets/rusticl/meson.build
@@ -52,6 +52,12 @@ librusticl = shared_library(
     ld_args_gc_sections,
     ld_args_bsymbolic,
     rusticl_ld_args,
+    # Seems like some proprietary apps ship libraries exporting C++ STL symbols.
+    # So let's just link statically against the standard C++ library then in order to prevent data
+    # layout mismatches and the likes.
+    cc.get_supported_link_arguments(
+      '-static-libstdc++',
+    ),
   ],
   link_depends : rusticl_ld_depends,
   version : '@0@.0.0'.format(opencl_version),