https://github.com/nikic created https://github.com/llvm/llvm-project/pull/125837
Backport a few fixes for flang/MLIR library dependencies related to MLIR_LINK_MLIR_DYLIB changes. >From 86f0bbcd6ed9d20c7d40a5033b2862bf1497d617 Mon Sep 17 00:00:00 2001 From: Nikita Popov <npo...@redhat.com> Date: Tue, 4 Feb 2025 16:37:21 +0100 Subject: [PATCH 1/3] [mlir] Fix MLIRTestDialect dependency in MLIRTestIR This is a test library which is not part of libMLIR, so it should use normal LINK_LIBS instead of mlir_target_link_libraries. This fixes an issue introduced in #123910 and follows up on the fix in #125004, which added the library to DEPENDS, which is not sufficient. --- mlir/test/lib/IR/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mlir/test/lib/IR/CMakeLists.txt b/mlir/test/lib/IR/CMakeLists.txt index e5416da70d5008..71a96c7f92c0c7 100644 --- a/mlir/test/lib/IR/CMakeLists.txt +++ b/mlir/test/lib/IR/CMakeLists.txt @@ -27,13 +27,15 @@ add_mlir_library(MLIRTestIR TestVisitorsGeneric.cpp EXCLUDE_FROM_LIBMLIR + + LINK_LIBS PUBLIC + MLIRTestDialect ) mlir_target_link_libraries(MLIRTestIR PUBLIC MLIRPass MLIRBytecodeReader MLIRBytecodeWriter MLIRFunctionInterfaces - MLIRTestDialect ) target_include_directories(MLIRTestIR >From 7745a4c7aa9ed5da0f540bfaa9e937e2d9b9a0f6 Mon Sep 17 00:00:00 2001 From: Nikita Popov <npo...@redhat.com> Date: Wed, 5 Feb 2025 09:48:23 +0100 Subject: [PATCH 2/3] [flang] Move FIRSupport dependency to correct place (#125697) This library is provided by flang, not MLIR, so it should not be part of MLIR_LIBS. Fixes an issue introduced in https://github.com/llvm/llvm-project/pull/120966. (cherry picked from commit ee76bdac192ce86c5d13e4c712e0327aaefda45f) --- flang/lib/Optimizer/Analysis/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flang/lib/Optimizer/Analysis/CMakeLists.txt b/flang/lib/Optimizer/Analysis/CMakeLists.txt index 6fe9c70f83765f..c4dae898f8e572 100644 --- a/flang/lib/Optimizer/Analysis/CMakeLists.txt +++ b/flang/lib/Optimizer/Analysis/CMakeLists.txt @@ -12,6 +12,7 @@ add_flang_library(FIRAnalysis LINK_LIBS FIRBuilder FIRDialect + FIRSupport HLFIRDialect MLIR_LIBS @@ -19,5 +20,4 @@ add_flang_library(FIRAnalysis MLIRLLVMDialect MLIRMathTransforms MLIROpenMPDialect - FIRSupport ) >From 29f3a87a262b986cf2249d50ac2a10307c8742ed Mon Sep 17 00:00:00 2001 From: Nikita Popov <npo...@redhat.com> Date: Wed, 5 Feb 2025 11:58:44 +0100 Subject: [PATCH 3/3] [flang][cmake] Fix bcc dependencies (#125822) The Fortran libraries are not part of MLIR, so they should use target_link_libraries() rather than mlir_target_link_libraries(). This fixes an issue introduced in https://github.com/llvm/llvm-project/pull/120966. (cherry picked from commit f9af5c145f40480d46874b643ca2b1237e9fbb2a) --- flang/tools/bbc/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flang/tools/bbc/CMakeLists.txt b/flang/tools/bbc/CMakeLists.txt index 85aeb85e0c5309..97462be83ea438 100644 --- a/flang/tools/bbc/CMakeLists.txt +++ b/flang/tools/bbc/CMakeLists.txt @@ -29,6 +29,11 @@ target_link_libraries(bbc PRIVATE flangFrontend flangPasses FlangOpenMPTransforms + FortranCommon + FortranParser + FortranEvaluate + FortranSemantics + FortranLower ) mlir_target_link_libraries(bbc PRIVATE @@ -36,9 +41,4 @@ mlir_target_link_libraries(bbc PRIVATE ${extension_libs} MLIRAffineToStandard MLIRSCFToControlFlow - FortranCommon - FortranParser - FortranEvaluate - FortranSemantics - FortranLower ) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
