[llvm] ff66d41 - Revert "[gn] port f29cfab55d1f"
Nico Weber via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 4 18:02:09 PST 2023
Author: Nico Weber
Date: 2023-01-04T21:01:30-05:00
New Revision: ff66d410fd87608db16a4ffb5caae1fd62374d5a
URL: https://github.com/llvm/llvm-project/commit/ff66d410fd87608db16a4ffb5caae1fd62374d5a
DIFF: https://github.com/llvm/llvm-project/commit/ff66d410fd87608db16a4ffb5caae1fd62374d5a.diff
LOG: Revert "[gn] port f29cfab55d1f"
This reverts commit 199563534a2fc38f72fa93c4fdd03221afe06996.
f29cfab55d1fd80 was reverted in c6c54132b76.
Added:
Modified:
llvm/unittests/Analysis/InlineAdvisorPlugin/CMakeLists.txt
llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
Removed:
llvm/utils/gn/secondary/llvm/unittests/Analysis/InlineAdvisorPlugin/BUILD.gn
################################################################################
diff --git a/llvm/unittests/Analysis/InlineAdvisorPlugin/CMakeLists.txt b/llvm/unittests/Analysis/InlineAdvisorPlugin/CMakeLists.txt
index d7165e487eec4..a819808b34984 100644
--- a/llvm/unittests/Analysis/InlineAdvisorPlugin/CMakeLists.txt
+++ b/llvm/unittests/Analysis/InlineAdvisorPlugin/CMakeLists.txt
@@ -10,9 +10,7 @@ if (NOT WIN32)
endif()
unset(LLVM_LINK_COMPONENTS)
- add_llvm_library(InlineAdvisorPlugin MODULE BUILDTREE_ONLY
- InlineAdvisorPlugin.cpp
- )
+ add_llvm_library(InlineAdvisorPlugin MODULE BUILDTREE_ONLY InlineAdvisorPlugin.cpp)
# Put PLUGIN next to the unit test executable.
set_output_directory(InlineAdvisorPlugin
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/../
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
index d946c57e338fc..ee865bc9f02d5 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
@@ -1,5 +1,31 @@
import("//third-party/unittest/unittest.gni")
+# Keyed off LLVM_ENABLE_PLUGINS in the CMake build, which is usually false
+# on Windows and true elsewhere.
+if (host_os != "win") {
+ foreach(plugin, [ "InlineAdvisorPlugin" ]) {
+ loadable_module(plugin) {
+ # Put plugin next to the unit test executable.
+ output_dir = target_out_dir
+
+ sources = [ "$plugin.cpp" ]
+
+ deps = [
+ # TestPlugin doesn't want to link in any LLVM code, it just needs its
+ # headers.
+ "//llvm/include/llvm/IR:public_tablegen",
+ ]
+
+ if (host_os != "mac" && host_os != "win") {
+ # The GN build currently doesn't globally pass -fPIC, but that's
+ # needed for building .so files on ELF. Just pass it manually
+ # for loadable_modules for now.
+ cflags = [ "-fPIC" ]
+ }
+ }
+ }
+}
+
unittest("AnalysisTests") {
deps = [
"//llvm/lib/Analysis",
@@ -58,7 +84,7 @@ unittest("AnalysisTests") {
# Otherwise, reconfiguring with plugins disabled will leave behind a stale
# executable.
if (host_os != "win") {
- deps += [ "InlineAdvisorPlugin" ]
+ deps += [ ":InlineAdvisorPlugin" ]
}
# Support plugins.
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Analysis/InlineAdvisorPlugin/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Analysis/InlineAdvisorPlugin/BUILD.gn
deleted file mode 100644
index 96d7b36d89da3..0000000000000
--- a/llvm/utils/gn/secondary/llvm/unittests/Analysis/InlineAdvisorPlugin/BUILD.gn
+++ /dev/null
@@ -1,25 +0,0 @@
-# Keyed off LLVM_ENABLE_PLUGINS in the CMake build, which is usually false
-# on Windows and true elsewhere.
-if (host_os != "win") {
- loadable_module("InlineAdvisorPlugin") {
- # Put plugin next to the unit test executable.
- output_dir =
- rebase_path(get_label_info("//llvm/unittests/Analysis:AnalysisTests",
- "target_out_dir"))
-
- sources = [ "InlineAdvisorPlugin.cpp" ]
-
- deps = [
- # TestPlugin doesn't want to link in any LLVM code, it just needs its
- # headers.
- "//llvm/include/llvm/IR:public_tablegen",
- ]
-
- if (host_os != "mac" && host_os != "win") {
- # The GN build currently doesn't globally pass -fPIC, but that's
- # needed for building .so files on ELF. Just pass it manually
- # for loadable_modules for now.
- cflags = [ "-fPIC" ]
- }
- }
-}
More information about the llvm-commits
mailing list