diff --git a/configs/toolchain-llvm14_14.0.6.json b/configs/toolchain-llvm14_14.0.6.json
index c057708..1470e1c 100644
--- a/configs/toolchain-llvm14_14.0.6.json
+++ b/configs/toolchain-llvm14_14.0.6.json
@@ -31,7 +31,8 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LD_LIBRARY_PATH"
+        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"
       ]
   },
   "runtime": {
diff --git a/configs/toolchain-llvm15_15.0.6.json b/configs/toolchain-llvm15_15.0.6.json
index 4c3f05f..a590671 100644
--- a/configs/toolchain-llvm15_15.0.6.json
+++ b/configs/toolchain-llvm15_15.0.6.json
@@ -31,7 +31,8 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LD_LIBRARY_PATH"
+        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"
       ]
   },
   "runtime": {
diff --git a/configs/toolchain-llvm16_16.0.4.json b/configs/toolchain-llvm16_16.0.4.json
index a0ffc08..b0684af 100644
--- a/configs/toolchain-llvm16_16.0.4.json
+++ b/configs/toolchain-llvm16_16.0.4.json
@@ -31,7 +31,8 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LD_LIBRARY_PATH"
+        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"
       ]
   },
   "runtime": {
diff --git a/configs/toolchain-llvm17_17.0.6.json b/configs/toolchain-llvm17_17.0.6.json
index 0ae924c..2b5e552 100644
--- a/configs/toolchain-llvm17_17.0.6.json
+++ b/configs/toolchain-llvm17_17.0.6.json
@@ -31,7 +31,8 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LD_LIBRARY_PATH"
+        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"
       ]
   },
   "runtime": {
diff --git a/configs/toolchain-llvm18_18.1.8.json b/configs/toolchain-llvm18_18.1.8.json
index 561a86f..66f94cb 100644
--- a/configs/toolchain-llvm18_18.1.8.json
+++ b/configs/toolchain-llvm18_18.1.8.json
@@ -34,7 +34,8 @@
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
         "export CXXFLAGS='-stdlib=libc++ -lc++abi'",
-        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LD_LIBRARY_PATH"
+        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"
       ]
   },
   "runtime": {
diff --git a/configs/toolchain-llvm19_19.1.7.json b/configs/toolchain-llvm19_19.1.7.json
index 94bafe7..8daa947 100644
--- a/configs/toolchain-llvm19_19.1.7.json
+++ b/configs/toolchain-llvm19_19.1.7.json
@@ -32,7 +32,8 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LD_LIBRARY_PATH"
+        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"
       ]
   },
   "runtime": {
diff --git a/configs/toolchain-llvm20_20.1.8.json b/configs/toolchain-llvm20_20.1.8.json
index 64d9e40..10da43b 100644
--- a/configs/toolchain-llvm20_20.1.8.json
+++ b/configs/toolchain-llvm20_20.1.8.json
@@ -32,7 +32,8 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LD_LIBRARY_PATH"
+        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"
       ]
   },
   "runtime": {
diff --git a/configs/toolchain-llvm21_21.1.8.json b/configs/toolchain-llvm21_21.1.8.json
index 44f62d3..fa5421b 100644
--- a/configs/toolchain-llvm21_21.1.8.json
+++ b/configs/toolchain-llvm21_21.1.8.json
@@ -32,7 +32,8 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LD_LIBRARY_PATH"
+        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"
       ]
   },
   "runtime": {
diff --git a/configs/toolchain-llvm22_22.1.6.json b/configs/toolchain-llvm22_22.1.6.json
index 23ae3dc..9667d41 100644
--- a/configs/toolchain-llvm22_22.1.6.json
+++ b/configs/toolchain-llvm22_22.1.6.json
@@ -32,7 +32,8 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LD_LIBRARY_PATH"
+        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"
       ]
   },
   "runtime": {