[PATCH] binutils: Always configure with --enable-targets=all

[PATCH] binutils: Always configure with --enable-targets=all

[Mark Wielaard]

Removes special case binutils_factory_target_all and
binutils_factory_target_all_libctf.
---
 builder/master.cfg | 39 +++------------------------------------
 1 file changed, 3 insertions(+), 36 deletions(-)

diff --git a/builder/master.cfg b/builder/master.cfg
index 0d94e67..29d1d6e 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -1796,21 +1796,6 @@ binutils_step_rm_build_dir = steps.ShellCommand(
         name="rm -rf binutils-build",
         haltOnFailure=True)
 binutils_step_configure = steps.Configure(
-        workdir='binutils-build',
-        command=['../binutils-gdb/configure',
-                 '--enable-gold',
-                 '--enable-shared'],
-        name='configure',
-        haltOnFailure=True)
-binutils_step_configure_libctf = steps.Configure(
-        workdir='binutils-build',
-        command=['../binutils-gdb/configure',
-                 '--enable-gold',
-                 '--enable-libctf',
-                 '--enable-shared'],
-        name='configure',
-        haltOnFailure=True)
-binutils_step_configure_target_all = steps.Configure(
         workdir='binutils-build',
         command=['../binutils-gdb/configure',
                  '--enable-gold',
@@ -1818,7 +1803,7 @@ binutils_step_configure_target_all = steps.Configure(
                  '--enable-targets=all'],
         name='configure',
         haltOnFailure=True)
-binutils_step_configure_target_all_libctf = steps.Configure(
+binutils_step_configure_libctf = steps.Configure(
         workdir='binutils-build',
         command=['../binutils-gdb/configure',
                  '--enable-gold',
@@ -1915,24 +1900,6 @@ binutils_factory_libctf.addStep(binutils_step_check_libctf)
 binutils_factory_libctf.addSteps(binutils_steps_bunsen_libctf)
 binutils_factory_libctf.addStep(binutils_make_clean_step)
 
-binutils_factory_target_all = util.BuildFactory()
-binutils_factory_target_all.addStep(binutils_step_git)
-binutils_factory_target_all.addStep(binutils_step_rm_build_dir)
-binutils_factory_target_all.addStep(binutils_step_configure_target_all)
-binutils_factory_target_all.addStep(binutils_step_compile)
-binutils_factory_target_all.addStep(binutils_step_check)
-binutils_factory_target_all.addSteps(binutils_steps_bunsen)
-binutils_factory_target_all.addStep(binutils_make_clean_step)
-
-binutils_factory_target_all_libctf = util.BuildFactory()
-binutils_factory_target_all_libctf.addStep(binutils_step_git)
-binutils_factory_target_all_libctf.addStep(binutils_step_rm_build_dir)
-binutils_factory_target_all_libctf.addStep(binutils_step_configure_target_all_libctf)
-binutils_factory_target_all_libctf.addStep(binutils_step_compile_libctf)
-binutils_factory_target_all_libctf.addStep(binutils_step_check_libctf)
-binutils_factory_target_all_libctf.addSteps(binutils_steps_bunsen_libctf)
-binutils_factory_target_all_libctf.addStep(binutils_make_clean_step)
-
 # Builds everything, but checks just gas and binutils, not ld.
 binutils_factory_gas_binutils = util.BuildFactory()
 binutils_factory_gas_binutils.addStep(binutils_step_git)
@@ -2053,7 +2020,7 @@ binutils_opensusetw_x86_64_builder = util.BuilderConfig(
 		    readContainerFile('opensuse-tumbleweed')},
         workernames=vm_workers,
         tags=["binutils", "opensusetw", "x86_64"],
-        factory=binutils_factory_target_all_libctf)
+        factory=binutils_factory_libctf)
 c['builders'].append(binutils_opensusetw_x86_64_builder)
 
 binutils_try_opensusetw_x86_64_builder = util.BuilderConfig(
@@ -2063,7 +2030,7 @@ binutils_try_opensusetw_x86_64_builder = util.BuilderConfig(
 		    readContainerFile('opensuse-tumbleweed')},
         workernames=vm_workers,
         tags=["binutils-try", "opensusetw", "x86_64"],
-        factory=binutils_factory_target_all_libctf)
+        factory=binutils_factory_libctf)
 c['builders'].append(binutils_try_opensusetw_x86_64_builder)
 
 binutils_opensuseleap_x86_64_builder = util.BuilderConfig(
-- 
2.30.2