From c290cb4292eabd8c68f3eb650becfa805ddab473 Mon Sep 17 00:00:00 2001
From: Chris Jones <chrisdjones15@gmail.com>
Date: Mon, 17 May 2021 11:42:20 -0500
Subject: [PATCH] Remove dependencies in FWCore BuildFiles

---
 FWCore/Concurrency/BuildFile.xml   | 2 +-
 FWCore/PluginManager/BuildFile.xml | 2 +-
 FWCore/Reflection/BuildFile.xml    | 2 +-
 FWCore/Utilities/BuildFile.xml     | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/FWCore/Concurrency/BuildFile.xml b/FWCore/Concurrency/BuildFile.xml
index 20afbc6592e02..a9748b4ba808d 100644
--- a/FWCore/Concurrency/BuildFile.xml
+++ b/FWCore/Concurrency/BuildFile.xml
@@ -1,4 +1,4 @@
-<use name="FWCore/Utilities"/>
+<use name="FWCore/Utilities" source_only="1"/>
 <use name="tbb"/>
 <export>
   <lib name="1"/>
diff --git a/FWCore/PluginManager/BuildFile.xml b/FWCore/PluginManager/BuildFile.xml
index 7ff30cad6a4f6..7cc290a70f2b8 100644
--- a/FWCore/PluginManager/BuildFile.xml
+++ b/FWCore/PluginManager/BuildFile.xml
@@ -1,6 +1,6 @@
 <use name="boost"/>
 <use name="tbb"/>
-<use name="rootcore"/>
+<use name="rootcling"/>
 <use name="FWCore/Utilities"/>
 <use name="stdcxx-fs"/>
 <export>
diff --git a/FWCore/Reflection/BuildFile.xml b/FWCore/Reflection/BuildFile.xml
index e2c435874d085..2b76428f73270 100644
--- a/FWCore/Reflection/BuildFile.xml
+++ b/FWCore/Reflection/BuildFile.xml
@@ -1,4 +1,4 @@
-<use name="rootcore"/>
+<use name="rootcling"/>
 <use name="FWCore/Utilities"/>
 <export>
   <lib name="1"/>
diff --git a/FWCore/Utilities/BuildFile.xml b/FWCore/Utilities/BuildFile.xml
index 00e50ed7deb75..9e5a6c7c5dd2f 100644
--- a/FWCore/Utilities/BuildFile.xml
+++ b/FWCore/Utilities/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="boost"/>
-<use name="boost_regex"/>
 <use name="libuuid"/>
 <use name="fmt"/>
 <use name="tbb"/>