d-millar updated this revision to Diff 378288. d-millar added a comment. FIx for potential conflicts with master.
Repository: rLLDB LLDB CHANGES SINCE LAST ACTION https://reviews.llvm.org/D111409/new/ https://reviews.llvm.org/D111409 Files: lldb/bindings/java/java-typemaps.swig lldb/bindings/java/java.swig lldb/source/API/CMakeLists.txt Index: lldb/source/API/CMakeLists.txt =================================================================== --- lldb/source/API/CMakeLists.txt +++ lldb/source/API/CMakeLists.txt @@ -81,7 +81,6 @@ SBThreadCollection.cpp SBThreadPlan.cpp SBTrace.cpp - SBTraceOptions.cpp SBType.cpp SBTypeCategory.cpp SBTypeEnumMember.cpp @@ -203,13 +202,7 @@ set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") endif() -if (MSVC) - # Only MSVC has the ABI compatibility problem and avoids using FindPythonLibs, - # so only it needs to explicitly link against ${Python3_LIBRARIES} - if (LLDB_ENABLE_PYTHON) - target_link_libraries(liblldb PRIVATE ${Python3_LIBRARIES}) - endif() -else() +if (NOT MSVC) set_target_properties(liblldb PROPERTIES OUTPUT_NAME lldb Index: lldb/bindings/java/java.swig =================================================================== --- lldb/bindings/java/java.swig +++ lldb/bindings/java/java.swig @@ -1,6 +1,3 @@ -/* ### - * IP: Apache License 2.0 with LLVM Exceptions - */ /* lldb.swig Index: lldb/bindings/java/java-typemaps.swig =================================================================== --- lldb/bindings/java/java-typemaps.swig +++ lldb/bindings/java/java-typemaps.swig @@ -1,6 +1,3 @@ -/* ### - * IP: Apache License 2.0 with LLVM Exceptions - */ %include <typemaps.i> %include <carrays.i> %include <various.i>
Index: lldb/source/API/CMakeLists.txt =================================================================== --- lldb/source/API/CMakeLists.txt +++ lldb/source/API/CMakeLists.txt @@ -81,7 +81,6 @@ SBThreadCollection.cpp SBThreadPlan.cpp SBTrace.cpp - SBTraceOptions.cpp SBType.cpp SBTypeCategory.cpp SBTypeEnumMember.cpp @@ -203,13 +202,7 @@ set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") endif() -if (MSVC) - # Only MSVC has the ABI compatibility problem and avoids using FindPythonLibs, - # so only it needs to explicitly link against ${Python3_LIBRARIES} - if (LLDB_ENABLE_PYTHON) - target_link_libraries(liblldb PRIVATE ${Python3_LIBRARIES}) - endif() -else() +if (NOT MSVC) set_target_properties(liblldb PROPERTIES OUTPUT_NAME lldb Index: lldb/bindings/java/java.swig =================================================================== --- lldb/bindings/java/java.swig +++ lldb/bindings/java/java.swig @@ -1,6 +1,3 @@ -/* ### - * IP: Apache License 2.0 with LLVM Exceptions - */ /* lldb.swig Index: lldb/bindings/java/java-typemaps.swig =================================================================== --- lldb/bindings/java/java-typemaps.swig +++ lldb/bindings/java/java-typemaps.swig @@ -1,6 +1,3 @@ -/* ### - * IP: Apache License 2.0 with LLVM Exceptions - */ %include <typemaps.i> %include <carrays.i> %include <various.i>
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits