[MLPolicies] Fix dependency and -DBUILD_SHARED_LIBS=on builds after D80579

diff --git a/llvm/lib/Analysis/CMakeLists.txt b/llvm/lib/Analysis/CMakeLists.txt
index 8fa832f..faf0a31 100644 (file)
--- a/llvm/lib/Analysis/CMakeLists.txt
+++ b/llvm/lib/Analysis/CMakeLists.txt
@@ -108,9 +108,4 @@ add_llvm_component_library(LLVMAnalysis
 
   DEPENDS
   intrinsics_gen
-  LLVMMLPolicies
-
-
-  LINK_LIBS
-  LLVMMLPolicies
   )

diff --git a/llvm/lib/Analysis/LLVMBuild.txt b/llvm/lib/Analysis/LLVMBuild.txt
index d73b55f..ef52c41 100644 (file)
--- a/llvm/lib/Analysis/LLVMBuild.txt
+++ b/llvm/lib/Analysis/LLVMBuild.txt
@@ -14,6 +14,9 @@
 ;
 ;===------------------------------------------------------------------------===;
 
+[common]
+subdirectories = ML
+
 [component_0]
 type = Library
 name = Analysis

diff --git a/llvm/lib/Analysis/ML/CMakeLists.txt b/llvm/lib/Analysis/ML/CMakeLists.txt
index ab4332f..80430ba 100644 (file)
--- a/llvm/lib/Analysis/ML/CMakeLists.txt
+++ b/llvm/lib/Analysis/ML/CMakeLists.txt
@@ -1,7 +1,5 @@
-set (SOURCES InlineFeaturesAnalysis.cpp)
-
-add_llvm_library(LLVMMLPolicies
-  ${SOURCES}
+add_llvm_component_library(LLVMMLPolicies
+  InlineFeaturesAnalysis.cpp
 
   DEPENDS
   intrinsics_gen

diff --git a/llvm/lib/Analysis/ML/LLVMBuild.txt b/llvm/lib/Analysis/ML/LLVMBuild.txt
new file mode 100644 (file)
index 0000000..a0bb919
--- /dev/null
+++ b/llvm/lib/Analysis/ML/LLVMBuild.txt
@@ -0,0 +1,21 @@
+;===- ./lib/Analysis/ML/LLVMBuild.txt --------------------------*- Conf -*--===;
+;
+; Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+; See https://llvm.org/LICENSE.txt for license information.
+; SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+;   http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[component_0]
+type = Library
+name = MLPolicies
+parent = Analysis
+required_libraries = Core Support

diff --git a/llvm/lib/Passes/LLVMBuild.txt b/llvm/lib/Passes/LLVMBuild.txt
index 438fc5c..14586b6 100644 (file)
--- a/llvm/lib/Passes/LLVMBuild.txt
+++ b/llvm/lib/Passes/LLVMBuild.txt
@@ -18,4 +18,4 @@
 type = Library
 name = Passes
 parent = Libraries
-required_libraries = AggressiveInstCombine Analysis CodeGen Core Coroutines IPO InstCombine Scalar Support Target TransformUtils Vectorize Instrumentation
+required_libraries = AggressiveInstCombine Analysis MLPolicies CodeGen Core Coroutines IPO InstCombine Scalar Support Target TransformUtils Vectorize Instrumentation