Skip to content

release/20.x: Fixes for flang/mlir dependencies #125837

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 11, 2025
Merged

release/20.x: Fixes for flang/mlir dependencies #125837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88f8956
[mlir] Fix MLIRTestDialect dependency in MLIRTestIR
nikic Feb 4, 2025
dfa60a7
[flang] Move FIRSupport dependency to correct place (#125697)
nikic Feb 5, 2025
4c4ed5e
[flang][cmake] Fix bcc dependencies (#125822)
nikic Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flang/lib/Optimizer/Analysis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ add_flang_library(FIRAnalysis
LINK_LIBS
FIRBuilder
FIRDialect
FIRSupport
HLFIRDialect

MLIR_LIBS
MLIRFuncDialect
MLIRLLVMDialect
MLIRMathTransforms
MLIROpenMPDialect
FIRSupport
)
10 changes: 5 additions & 5 deletions flang/tools/bbc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ target_link_libraries(bbc PRIVATE
flangFrontend
flangPasses
FlangOpenMPTransforms
FortranCommon
FortranParser
FortranEvaluate
FortranSemantics
FortranLower
)

mlir_target_link_libraries(bbc PRIVATE
${dialect_libs}
${extension_libs}
MLIRAffineToStandard
MLIRSCFToControlFlow
FortranCommon
FortranParser
FortranEvaluate
FortranSemantics
FortranLower
)
4 changes: 3 additions & 1 deletion mlir/test/lib/IR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down