Fixed LD_LIBRARY_PATH string escaping

kerberjg · kerberjg · commit 71cef5ec9928 · 2026-06-26T12:47:04.000+02:00
Fixes an error that prevented runtime loading of necessary libraries
diff --git a/configs/toolchain-llvm14_14.0.6.json b/configs/toolchain-llvm14_14.0.6.json
@@ -31,7 +31,7 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "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"
       ]
   },
diff --git a/configs/toolchain-llvm15_15.0.6.json b/configs/toolchain-llvm15_15.0.6.json
@@ -31,7 +31,7 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "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"
       ]
   },
diff --git a/configs/toolchain-llvm16_16.0.4.json b/configs/toolchain-llvm16_16.0.4.json
@@ -31,7 +31,7 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "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"
       ]
   },
diff --git a/configs/toolchain-llvm17_17.0.6.json b/configs/toolchain-llvm17_17.0.6.json
@@ -31,7 +31,7 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "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"
       ]
   },
diff --git a/configs/toolchain-llvm18_18.1.8.json b/configs/toolchain-llvm18_18.1.8.json
@@ -34,7 +34,7 @@
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
         "export CXXFLAGS='-stdlib=libc++ -lc++abi'",
-        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "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"
       ]
   },
diff --git a/configs/toolchain-llvm19_19.1.7.json b/configs/toolchain-llvm19_19.1.7.json
@@ -32,7 +32,7 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "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"
       ]
   },
diff --git a/configs/toolchain-llvm20_20.1.8.json b/configs/toolchain-llvm20_20.1.8.json
@@ -32,7 +32,7 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "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"
       ]
   },
diff --git a/configs/toolchain-llvm21_21.1.8.json b/configs/toolchain-llvm21_21.1.8.json
@@ -32,7 +32,7 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "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"
       ]
   },
diff --git a/configs/toolchain-llvm22_22.1.6.json b/configs/toolchain-llvm22_22.1.6.json
@@ -32,7 +32,7 @@
         "export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",
         "export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",
         "export PATH=$LLVM_BINDIR:$PATH",
-        "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" || echo \\\"unknown-linux-gnu\\\" )\"",
+        "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"
       ]
   },

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`"export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",`
`32`	`32`	`"export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",`
`33`	`33`	`"export PATH=$LLVM_BINDIR:$PATH",`
`34`		`- "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" \|\| echo \\\"unknown-linux-gnu\\\" )\"",`
	`34`	`+ "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo 'apple-darwin' \|\| echo 'unknown-linux-gnu' )\"",`
`35`	`35`	`"export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"`
`36`	`36`	`]`
`37`	`37`	`},`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`"export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",`
`35`	`35`	`"export PATH=$LLVM_BINDIR:$PATH",`
`36`	`36`	`"export CXXFLAGS='-stdlib=libc++ -lc++abi'",`
`37`		`- "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" \|\| echo \\\"unknown-linux-gnu\\\" )\"",`
	`37`	`+ "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo 'apple-darwin' \|\| echo 'unknown-linux-gnu' )\"",`
`38`	`38`	`"export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"`
`39`	`39`	`]`
`40`	`40`	`},`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`"export LLVM_LIBDIR=$LLVM_BASE_DIR/lib",`
`33`	`33`	`"export LLVM_CONFIG=$LLVM_BINDIR/llvm-config",`
`34`	`34`	`"export PATH=$LLVM_BINDIR:$PATH",`
`35`		`- "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo \\\"apple-darwin\\\" \|\| echo \\\"unknown-linux-gnu\\\" )\"",`
	`35`	`+ "export OS_LIBPATH=\"$(uname -m)-$( [ \\\"$(uname -s)\\\" = \\\"Darwin\\\" ] && echo 'apple-darwin' \|\| echo 'unknown-linux-gnu' )\"",`
`36`	`36`	`"export LD_LIBRARY_PATH=$LLVM_LIBDIR:$LLVM_LIBDIR/$OS_LIBPATH:$LD_LIBRARY_PATH"`
`37`	`37`	`]`
`38`	`38`	`},`