Skip to content

Commit c964411

Browse files
committed
Rework lit.cfg regex to avoid basename subshell in substituion
Changed %target-build-swift-dylib\(([^)]+)\) to %target-build-swift-dylib\(([^)]+?)([^/()]+)\) Group 1 now captures the "prefix" and group 2 captures the final word Captured the basename directly in the regex instead of using a subshell since Lit's internal shell does not support
1 parent 8975d1a commit c964411

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/lit.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1665,8 +1665,8 @@ if run_vendor == 'apple':
16651665

16661666
config.target_build_swift_dylib = SubstituteCaptures(
16671667
f"{escape_for_substitute_captures(config.target_build_swift)}"
1668-
r" -parse-as-library -emit-library -o '\1'"
1669-
r" -Xlinker -install_name -Xlinker @executable_path/$(basename '\1')"
1668+
r" -parse-as-library -emit-library -o '\1\2'"
1669+
r" -Xlinker -install_name -Xlinker @executable_path/\2"
16701670
)
16711671
config.target_add_rpath = SubstituteCaptures(r'-Xlinker -rpath -Xlinker \1')
16721672

@@ -2938,7 +2938,7 @@ config.substitutions.append(('%target-run-stdlib-swift', config.target_run_stdli
29382938
config.substitutions.append(('%target-repl-run-simple-swift', subst_target_repl_run_simple_swift))
29392939
config.substitutions.append(('%target-run', config.target_run))
29402940
config.substitutions.append(('%target-jit-run', subst_target_jit_run))
2941-
config.substitutions.append(('%target-build-swift-dylib\(([^)]+)\)', config.target_build_swift_dylib))
2941+
config.substitutions.append(('%target-build-swift-dylib\(([^)]+?)([^/()]+)\)', config.target_build_swift_dylib))
29422942
config.substitutions.append(('%target-codesign', config.target_codesign))
29432943
config.substitutions.append(('%target-build-swift', config.target_build_swift))
29442944
config.substitutions.append(('%target-clang', config.target_clang))

0 commit comments

Comments
 (0)