From 9920fb92abe35d6f8d377667a8e17761c5265eb3 Mon Sep 17 00:00:00 2001 From: Chris Cummins Date: Thu, 10 Mar 2022 17:12:13 +0000 Subject: [PATCH] [cmake] Fix regressions introduced in #600. Merging PR #600 set the cmake build on fire. --- compiler_gym/CMakeLists.txt | 1 - compiler_gym/envs/llvm/service/CMakeLists.txt | 5 +---- tests/pytest_plugins/BUILD | 1 - tests/pytest_plugins/CMakeLists.txt | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/compiler_gym/CMakeLists.txt b/compiler_gym/CMakeLists.txt index fda2b87aa..59634c514 100644 --- a/compiler_gym/CMakeLists.txt +++ b/compiler_gym/CMakeLists.txt @@ -23,7 +23,6 @@ cg_py_library( compiler_gym::util::util compiler_gym::util::flags::flags compiler_gym::wrappers::wrappers - compiler_gym::envs::llvm::specs PUBLIC ) diff --git a/compiler_gym/envs/llvm/service/CMakeLists.txt b/compiler_gym/envs/llvm/service/CMakeLists.txt index ce32b1412..67b51fa73 100644 --- a/compiler_gym/envs/llvm/service/CMakeLists.txt +++ b/compiler_gym/envs/llvm/service/CMakeLists.txt @@ -37,8 +37,6 @@ cg_cc_library( ABS_DEPS fmt magic_enum - NON_LIB_DEPS - compiler_gym::envs::llvm::service::passes::actions_genfiles PUBLIC ) @@ -183,7 +181,6 @@ cg_cc_library( "-DGOOGLE_PROTOBUF_NO_RTTI" "-fno-rtti" HDRS - compiler_gym::envs::llvm::service::passes::10.0.0::headers "LlvmSession.h" SRCS "LlvmSession.cc" @@ -194,6 +191,7 @@ cg_cc_library( ::Cost ::Observation ::ObservationSpaces + compiler_gym::envs::llvm::service::passes::10.0.0::headers compiler_gym::service::CompilationSession compiler_gym::service::proto::compiler_gym_service_cc_grpc compiler_gym::third_party::autophase::InstCount @@ -215,7 +213,6 @@ cg_cc_library( Clog::libclog INCLUDES ${LLVM_INCLUDE_DIRS} - "$" DEFINES ${LLVM_DEFINITIONS} PUBLIC diff --git a/tests/pytest_plugins/BUILD b/tests/pytest_plugins/BUILD index fcd4c2dc4..ec80ce17a 100644 --- a/tests/pytest_plugins/BUILD +++ b/tests/pytest_plugins/BUILD @@ -23,7 +23,6 @@ py_library( testonly = 1, srcs = ["llvm.py"], data = [ - "//compiler_gym/envs/llvm/service/passes:actions_genfiles", "//compiler_gym/third_party/cbench:benchmarks_list", ], deps = [ diff --git a/tests/pytest_plugins/CMakeLists.txt b/tests/pytest_plugins/CMakeLists.txt index a1175952b..c2a1fcd25 100644 --- a/tests/pytest_plugins/CMakeLists.txt +++ b/tests/pytest_plugins/CMakeLists.txt @@ -23,7 +23,6 @@ cg_py_library( SRCS "llvm.py" DATA - compiler_gym::envs::llvm::service::passes::actions_genfiles compiler_gym::third_party::cbench::benchmarks_list DEPS compiler_gym::envs::llvm::llvm