split out variable references

kikairoya · kikairoya · commit 9fa6564e4d25 · 2025-10-19T12:14:45.000+09:00
diff --git a/clang-tools-extra/clangd/unittests/lit.cfg.py b/clang-tools-extra/clangd/unittests/lit.cfg.py
@@ -24,7 +24,7 @@
 else:
     shlibpath_var = "LD_LIBRARY_PATH"
 config.environment[shlibpath_var] = os.path.pathsep.join(
-    (config.shlibdir, config.llvm_libs_dir, config.environment.get(shlibpath_var, ""))
+    ("@SHLIBDIR@", "@LLVM_LIBS_DIR@", config.environment.get(shlibpath_var, ""))
 )
 
 # It is not realistically possible to account for all options that could
diff --git a/clang-tools-extra/include-cleaner/test/Unit/lit.cfg.py b/clang-tools-extra/include-cleaner/test/Unit/lit.cfg.py
@@ -16,7 +16,7 @@
 else:
     shlibpath_var = "LD_LIBRARY_PATH"
 config.environment[shlibpath_var] = os.path.pathsep.join(
-    (config.shlibdir, config.llvm_libs_dir, config.environment.get(shlibpath_var, ""))
+    ("@SHLIBDIR@", "@LLVM_LIBS_DIR@", config.environment.get(shlibpath_var, ""))
 )
 
 # It is not realistically possible to account for all options that could

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`else:`
`25`	`25`	`shlibpath_var = "LD_LIBRARY_PATH"`
`26`	`26`	`config.environment[shlibpath_var] = os.path.pathsep.join(`
`27`		`- (config.shlibdir, config.llvm_libs_dir, config.environment.get(shlibpath_var, ""))`
	`27`	`+ ("@SHLIBDIR@", "@LLVM_LIBS_DIR@", config.environment.get(shlibpath_var, ""))`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`# It is not realistically possible to account for all options that could`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`else:`
`17`	`17`	`shlibpath_var = "LD_LIBRARY_PATH"`
`18`	`18`	`config.environment[shlibpath_var] = os.path.pathsep.join(`
`19`		`- (config.shlibdir, config.llvm_libs_dir, config.environment.get(shlibpath_var, ""))`
	`19`	`+ ("@SHLIBDIR@", "@LLVM_LIBS_DIR@", config.environment.get(shlibpath_var, ""))`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`# It is not realistically possible to account for all options that could`