diff options
| author | Felipe de Azevedo Piovezan <fpiovezan@apple.com> | 2022-09-08 14:37:46 -0400 |
|---|---|---|
| committer | Felipe de Azevedo Piovezan <fpiovezan@apple.com> | 2022-09-08 14:38:08 -0400 |
| commit | 9a41f6e7080e7ca6274a460e9e32ba616fa46249 (patch) | |
| tree | 83d90701b541a83216526e8f0512566e4a179e72 /lldb/packages | |
| parent | b69f10f5a118ec6efe5edfae2deb376b53877170 (diff) | |
| download | llvm-9a41f6e7080e7ca6274a460e9e32ba616fa46249.tar.gz | |
Revert "[lldb] Use just-built libcxx for tests when available"
This reverts commit c38eeecbc7d929c9601f2189214a7a90d3982a47.
Diffstat (limited to 'lldb/packages')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index c0fd5ecd0dc8..937a2ae06fc4 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -387,16 +387,6 @@ endif #---------------------------------------------------------------------- # C++ standard library options #---------------------------------------------------------------------- -ifneq ($(and $(USE_LIBSTDCPP), $(USE_LIBCPP)),) - $(error Libcxx and Libstdc++ cannot be used together) -endif - -ifeq (1, $(USE_SYSTEM_STDLIB)) - ifneq ($(or $(USE_LIBSTDCPP), $(USE_LIBCPP)),) - $(error Cannot use system's standard library and a custom standard library together) - endif -endif - ifeq (1,$(USE_LIBSTDCPP)) # Clang requires an extra flag: -stdlib=libstdc++ ifneq (,$(findstring clang,$(CC))) @@ -425,15 +415,6 @@ ifeq (1,$(USE_LIBCPP)) endif endif -# If no explicit request was made, but we have paths to a custom libcxx, use -# them. -ifeq ($(or $(USE_LIBSTDCPP), $(USE_LIBCPP), $(USE_SYSTEM_STDLIB)),) - ifneq ($(and $(LIBCPP_INCLUDE_DIR), $(LIBCPP_LIBRARY_DIR)),) - CXXFLAGS += -nostdlib++ -nostdinc++ -cxx-isystem $(LIBCPP_INCLUDE_DIR) - LDFLAGS += -L$(LLVM_LIBS_DIR) -Wl,-rpath,$(LIBCPP_LIBRARY_DIR) -lc++ - endif -endif - #---------------------------------------------------------------------- # Additional system libraries #---------------------------------------------------------------------- |