Skip to content

Commit 46f0f57

Browse files
felipepiovezangithub-actions[bot]
authored andcommitted
Automerge: Revert "[LLDB] Update Shell lit config to handle c8031c3" (#170288)
Reverts llvm/llvm-project#170225 See failures in https://ci.swift.org/view/all/job/llvm.org/job/as-lldb-cmake/36912/ ``` [2025-12-02T01:20:37.083Z] # .---command stderr------------ [2025-12-02T01:20:37.083Z] # | clang: warning: no such sysroot directory: 'b/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' [-Wmissing-sysroot] [2025-12-02T01:20:37.083Z] # | clang: warning: argument unused during compilation: '-fmodules-cache-path=/Users/ec2-user/jenkins/workspace/llvm.org/as-lldb-cmake/lldb-build/lldb-test-build.noindex/module-cache-clang/lldb-shell' [-Wunused-command-line-argument] [2025-12-02T01:20:37.083Z] # | /Users/ec2-user/jenkins/workspace/llvm.org/as-lldb-cmake/lldb-build/tools/lldb/test/Shell/Settings/Output/TestFrameFormatFunctionPrefix.test.tmp/main.m:2:13: warning: non-void function does not return a value [-Wreturn-type] [2025-12-02T01:20:37.083Z] # | 2 | int func() {} [2025-12-02T01:20:37.083Z] # | | ^ [2025-12-02T01:20:37.083Z] # | /Users/ec2-user/jenkins/workspace/llvm.org/as-lldb-cmake/lldb-build/tools/lldb/test/Shell/Settings/Output/TestFrameFormatFunctionPrefix.test.tmp/main.m:3:21: warning: non-void function does not return a value [-Wreturn-type] [2025-12-02T01:20:37.083Z] # | 3 | int bar() { func(); } [2025-12-02T01:20:37.083Z] # | | ^ [2025-12-02T01:20:37.083Z] # | 2 warnings generated. [2025-12-02T01:20:37.083Z] # | ld: library 'System' not found [2025-12-02T01:20:37.083Z] # | clang: error: linker command failed with exit code 1 (use -v to see invocation) [2025-12-02T01:20:37.083Z] # `----------------------------- [2025-12-02T01:20:37.083Z] # error: command failed with exit status: 1 ```
2 parents 5780cef + ac23264 commit 46f0f57

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lldb/test/Shell/helper/toolchain.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ def use_support_substitutions(config):
226226
except OSError:
227227
res = -1
228228
if res == 0 and out:
229-
sdk_path = str(out)
229+
sdk_path = lit.util.to_string(out)
230230
llvm_config.lit_config.note("using SDKROOT: %r" % sdk_path)
231231
host_flags += ["-isysroot", sdk_path]
232232
elif sys.platform != "win32":

0 commit comments

Comments
 (0)