Skip to content

[cherry-pick][swift/release/5.9] [lldb][cmake] Allow specifying custom libcxx for tests in standalone builds #6899

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

Conversation

Michael137
Copy link

@Michael137 Michael137 commented May 20, 2023

Standalone builds currently do not set the LLDB_HAS_LIBCXX, LIBCXX_LIBRARY_DIR, LIBCXX_GENERATED_INCLUDE_DIR. These are necessary for API tests with USE_LIBCPP to run against a custom built libcxx. Thus on all buildbots using standalone builds (most notably the public swift-ci), the API tests always run against the libcxx headers in the system SDK.

This patch introduces a new cmake variable LLDB_TEST_LIBCXX_ROOT_DIR that allows us to point the tests in standalone builds to a custom libcxx directory.

Since the user can control the libcxx location we can hard error if no such custom libcxx build exists.

Differential Revision: https://reviews.llvm.org/D150954

(cherry picked from commit 2901ce3ac24799dacda21be3903d6d8294b70ea0)

…builds

Standalone builds currently do not set the `LLDB_HAS_LIBCXX`,
`LIBCXX_LIBRARY_DIR`, `LIBCXX_GENERATED_INCLUDE_DIR`.
These are necessary for API tests with `USE_LIBCPP` to run against
a custom built libcxx. Thus on all buildbots using standalone builds
(most notably the public swift-ci), the API tests always run against
the libcxx headers in the system SDK.

This patch introduces a new cmake variable `LLDB_TEST_LIBCXX_ROOT_DIR`
that allows us to point the tests in standalone builds to a custom
libcxx directory.

Since the user can control the libcxx location we can hard error if
no such custom libcxx build exists.

Differential Revision: https://reviews.llvm.org/D150954

(cherry picked from commit 2901ce3ac24799dacda21be3903d6d8294b70ea0)
@Michael137 Michael137 changed the title [lldb][cmake] Allow specifying custom libcxx for tests in standalone … [lldb][cmake] Allow specifying custom libcxx for tests in standalone builds May 20, 2023
@Michael137 Michael137 changed the title [lldb][cmake] Allow specifying custom libcxx for tests in standalone builds [cherry-pick][swift/release/5.9] [lldb][cmake] Allow specifying custom libcxx for tests in standalone builds May 20, 2023
@Michael137
Copy link
Author

@swift-ci test

@Michael137 Michael137 requested a review from adrian-prantl May 20, 2023 11:03
@Michael137
Copy link
Author

Please test with following PR:
swiftlang/swift#66026

@swift-ci test

@Michael137
Copy link
Author

Please test with following PR:
swiftlang/swift#66026
#6901

@swift-ci test

@adrian-prantl
Copy link

test with #6901
@swift-ci test

@Michael137
Copy link
Author

Please test with following PR:
swiftlang/swift#66026
#6901

@swift-ci test macOS Platform

@Michael137 Michael137 closed this May 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants