[flang-commits] [flang] [flang] Fix linking to libMLIR (PR #135483)

[Michał Górny via flang-commits]

https://github.com/mgorny updated https://github.com/llvm/llvm-project/pull/135483

>From ce4554dda3e6f6a942aba9381e392589ee745934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny at gentoo.org>
Date: Sat, 12 Apr 2025 10:12:08 +0200
Subject: [PATCH 1/2] [flang] Fix linking to libMLIR

Fix regression to MLIR dylib support introduced in #135240.
---
 flang/lib/Optimizer/Dialect/FIRCG/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/flang/lib/Optimizer/Dialect/FIRCG/CMakeLists.txt b/flang/lib/Optimizer/Dialect/FIRCG/CMakeLists.txt
index 107d567056b59..af9315a980afb 100644
--- a/flang/lib/Optimizer/Dialect/FIRCG/CMakeLists.txt
+++ b/flang/lib/Optimizer/Dialect/FIRCG/CMakeLists.txt
@@ -6,6 +6,8 @@ add_flang_library(FIRCodeGenDialect
 
   LINK_LIBS
   FIRDialect
+
+  MLIR_LIBS
   MLIRIR
 
   LINK_COMPONENTS

>From 31cc505f7e2f477740092bc86c99cc08214d0f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny at gentoo.org>
Date: Mon, 14 Apr 2025 18:43:30 +0200
Subject: [PATCH 2/2] Fix MLIR_LIBS ordering

---
 flang/lib/Optimizer/Dialect/FIRCG/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flang/lib/Optimizer/Dialect/FIRCG/CMakeLists.txt b/flang/lib/Optimizer/Dialect/FIRCG/CMakeLists.txt
index af9315a980afb..cd5865fc8766a 100644
--- a/flang/lib/Optimizer/Dialect/FIRCG/CMakeLists.txt
+++ b/flang/lib/Optimizer/Dialect/FIRCG/CMakeLists.txt
@@ -7,10 +7,10 @@ add_flang_library(FIRCodeGenDialect
   LINK_LIBS
   FIRDialect
 
-  MLIR_LIBS
-  MLIRIR
-
   LINK_COMPONENTS
   AsmParser
   AsmPrinter
+
+  MLIR_LIBS
+  MLIRIR
   )