Skip to content

[lldb] Use system c++ lib for LLDB STL tests #112598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2024
Merged

Conversation

zeroomega
Copy link
Contributor

This change partially reverts #112357 to avoid test failures on machines which do not have gcc installed.

Test run: https://ci.chromium.org/ui/p/fuchsia/builders/toolchain.ci.shadow/lldb-linux-x64/b8733897350805827393/overview

@llvmbot llvmbot added the lldb label Oct 16, 2024
@zeroomega zeroomega changed the title [lldb] Use system c++ lib for stl libs [lldb] Use system c++ lib for LLDB STL tests Oct 16, 2024
@llvmbot
Copy link
Member

llvmbot commented Oct 16, 2024

@llvm/pr-subscribers-lldb

Author: Haowei (zeroomega)

Changes

This change partially reverts #112357 to avoid test failures on machines which do not have gcc installed.

Test run: https://ci.chromium.org/ui/p/fuchsia/builders/toolchain.ci.shadow/lldb-linux-x64/b8733897350805827393/overview


Full diff: https://github.com/llvm/llvm-project/pull/112598.diff

1 Files Affected:

  • (modified) lldb/test/API/lang/cpp/stl/Makefile (+1-5)
diff --git a/lldb/test/API/lang/cpp/stl/Makefile b/lldb/test/API/lang/cpp/stl/Makefile
index 4408691f01b701..8534fa9b00209e 100644
--- a/lldb/test/API/lang/cpp/stl/Makefile
+++ b/lldb/test/API/lang/cpp/stl/Makefile
@@ -1,9 +1,5 @@
 CXX_SOURCES := main.cpp
 
-ifneq ($(OS),Darwin)
-    USE_LIBSTDCPP := 1
-else
-    USE_SYSTEM_STDLIB := 1
-endif
+USE_SYSTEM_STDLIB := 1
 
 include Makefile.rules

Copy link
Member

@Michael137 Michael137 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we need to just remove all the USE_ variables. The PR that broke your bots was itself motivated by a breakage due to USE_SYSTEM_STDLIB

This change partially reverts llvm#112357 to avoid LLDB STL test
failures on machines which do not have gcc installed.
@zeroomega
Copy link
Contributor Author

I believe we need to just remove all the USE_ variables. The PR that broke your bots was itself motivated by a breakage due to USE_SYSTEM_STDLIB

Done.
Test run in progress: https://ci.chromium.org/b/8733895290278713505

@zeroomega
Copy link
Contributor Author

The patch passed all presubmit tests.
Can I get a approval to land it?

Copy link
Member

@Michael137 Michael137 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thx!

@zeroomega zeroomega merged commit 8f683b5 into llvm:main Oct 16, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants