Author: Pavel Labath Date: 2020-07-01T16:56:56+02:00 New Revision: 1276855f2b4485ec312b379c1b8eaf5510d9b157
URL: https://github.com/llvm/llvm-project/commit/1276855f2b4485ec312b379c1b8eaf5510d9b157 DIFF: https://github.com/llvm/llvm-project/commit/1276855f2b4485ec312b379c1b8eaf5510d9b157.diff LOG: [lldb] Attempt to fix TestLimitDebugInfo on windows The test fails due to link errors. I believe this change should fix that. Added: Modified: lldb/test/API/functionalities/limit-debug-info/Makefile lldb/test/API/functionalities/limit-debug-info/onetwo.h Removed: ################################################################################ diff --git a/lldb/test/API/functionalities/limit-debug-info/Makefile b/lldb/test/API/functionalities/limit-debug-info/Makefile index 874b3a15e0fe..400f76e29e1a 100644 --- a/lldb/test/API/functionalities/limit-debug-info/Makefile +++ b/lldb/test/API/functionalities/limit-debug-info/Makefile @@ -2,12 +2,12 @@ CFLAGS_EXTRAS = $(LIMIT_DEBUG_INFO_FLAGS) LD_EXTRAS = -L. -lone -ltwo CXX_SOURCES = main.cpp -ONE_CXXFLAGS = $(LIMIT_DEBUG_INFO_FLAGS) +ONE_CXXFLAGS = $(LIMIT_DEBUG_INFO_FLAGS) -DIN_ONE ifdef STRIP_ONE ONE_CXXFLAGS += -g0 endif -TWO_CXXFLAGS = $(LIMIT_DEBUG_INFO_FLAGS) +TWO_CXXFLAGS = $(LIMIT_DEBUG_INFO_FLAGS) -DIN_TWO ifdef STRIP_TWO TWO_CXXFLAGS += -g0 endif diff --git a/lldb/test/API/functionalities/limit-debug-info/onetwo.h b/lldb/test/API/functionalities/limit-debug-info/onetwo.h index 82df76c64b58..602a88c58eeb 100644 --- a/lldb/test/API/functionalities/limit-debug-info/onetwo.h +++ b/lldb/test/API/functionalities/limit-debug-info/onetwo.h @@ -1,10 +1,22 @@ -struct One { +#ifdef IN_ONE +#define ONE_API LLDB_DYLIB_EXPORT +#else +#define ONE_API LLDB_DYLIB_IMPORT +#endif + +#ifdef IN_TWO +#define TWO_API LLDB_DYLIB_EXPORT +#else +#define TWO_API LLDB_DYLIB_IMPORT +#endif + +struct ONE_API One { int one = 142; constexpr One() = default; virtual ~One(); }; -struct Two : One { +struct TWO_API Two : One { int two = 242; constexpr Two() = default; ~Two() override; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits