diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec
index 9dad799..dfc6287 100644
--- a/cross-aarch64-gcc13-bootstrap.spec
+++ b/cross-aarch64-gcc13-bootstrap.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec
index 435ca0f..29ffc44 100644
--- a/cross-aarch64-gcc13.spec
+++ b/cross-aarch64-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec
index 8117d2e..6b7f167 100644
--- a/cross-amdgcn-gcc13.spec
+++ b/cross-amdgcn-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec
index 167b553..408cfcc 100644
--- a/cross-arm-gcc13.spec
+++ b/cross-arm-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec
index d147da7..26a59fb 100644
--- a/cross-arm-none-gcc13-bootstrap.spec
+++ b/cross-arm-none-gcc13-bootstrap.spec
@@ -194,6 +194,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec
index 0f9ae6d..65f828f 100644
--- a/cross-arm-none-gcc13.spec
+++ b/cross-arm-none-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec
index 8e68a55..0137a7f 100644
--- a/cross-avr-gcc13-bootstrap.spec
+++ b/cross-avr-gcc13-bootstrap.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec
index 9a347e9..dab5585 100644
--- a/cross-avr-gcc13.spec
+++ b/cross-avr-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec
index 81ba1bc..89ed068 100644
--- a/cross-bpf-gcc13.spec
+++ b/cross-bpf-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec
index 1feb0de..412b881 100644
--- a/cross-epiphany-gcc13-bootstrap.spec
+++ b/cross-epiphany-gcc13-bootstrap.spec
@@ -194,6 +194,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec
index c61bc4b..eea57b6 100644
--- a/cross-epiphany-gcc13.spec
+++ b/cross-epiphany-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec
index 46017e8..8ac4989 100644
--- a/cross-hppa-gcc13-bootstrap.spec
+++ b/cross-hppa-gcc13-bootstrap.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec
index 7208ef4..a9abebe 100644
--- a/cross-hppa-gcc13.spec
+++ b/cross-hppa-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec
index b2fb893..36541b6 100644
--- a/cross-m68k-gcc13.spec
+++ b/cross-m68k-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec
index fda9173..b478f3b 100644
--- a/cross-mips-gcc13.spec
+++ b/cross-mips-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec
index 050deb5..792e17e 100644
--- a/cross-nvptx-gcc13.spec
+++ b/cross-nvptx-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec
index c577a00..c5a8e60 100644
--- a/cross-ppc64-gcc13.spec
+++ b/cross-ppc64-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec
index 6cd9979..7ef0bac 100644
--- a/cross-ppc64le-gcc13.spec
+++ b/cross-ppc64le-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec
index bb2691c..1ea67ca 100644
--- a/cross-pru-gcc13-bootstrap.spec
+++ b/cross-pru-gcc13-bootstrap.spec
@@ -194,6 +194,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec
index dbde193..9018b80 100644
--- a/cross-pru-gcc13.spec
+++ b/cross-pru-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec
index 4e8933e..1cba0e7 100644
--- a/cross-riscv64-elf-gcc13-bootstrap.spec
+++ b/cross-riscv64-elf-gcc13-bootstrap.spec
@@ -194,6 +194,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec
index 23f8213..31d0928 100644
--- a/cross-riscv64-elf-gcc13.spec
+++ b/cross-riscv64-elf-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec
index 16a483c..8dd63fb 100644
--- a/cross-riscv64-gcc13-bootstrap.spec
+++ b/cross-riscv64-gcc13-bootstrap.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec
index 0c564bb..5b03c86 100644
--- a/cross-riscv64-gcc13.spec
+++ b/cross-riscv64-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec
index 8411668..6ba4da8 100644
--- a/cross-rx-gcc13-bootstrap.spec
+++ b/cross-rx-gcc13-bootstrap.spec
@@ -194,6 +194,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec
index 02ea402..78aea5b 100644
--- a/cross-rx-gcc13.spec
+++ b/cross-rx-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec
index 9343d13..bd76b64 100644
--- a/cross-s390x-gcc13.spec
+++ b/cross-s390x-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec
index 6952706..8812d0b 100644
--- a/cross-sparc-gcc13.spec
+++ b/cross-sparc-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec
index 92c97ef..05644b4 100644
--- a/cross-sparc64-gcc13.spec
+++ b/cross-sparc64-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec
index 3542c74..a478664 100644
--- a/cross-x86_64-gcc13.spec
+++ b/cross-x86_64-gcc13.spec
@@ -193,6 +193,9 @@ BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
diff --git a/cross.spec.in b/cross.spec.in
index f48f7d2..e8a7bf5 100644
--- a/cross.spec.in
+++ b/cross.spec.in
@@ -104,6 +104,9 @@ BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gettext-devel
 BuildRequires: glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires: memory-constraints
+%endif
 BuildRequires: mpc-devel
 BuildRequires: mpfr-devel
 BuildRequires: perl
diff --git a/gcc.spec.in b/gcc.spec.in
index 3a46566..9486201 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -17,8 +17,6 @@
 
 # nospeccleaner
 
-%global flavor @BUILD_FLAVOR@%{nil}
-
 %if 0%{?suse_version} < 1550
 %define _slibdir  /%{_lib}
 %define slibdir   /lib
@@ -129,12 +127,8 @@
 %define build_jit 0
 %endif
 
-# Limit the number of parallel jobs to avoid OOM for gcc13
-%if "%{flavor}" == ""
+# Limit the number of parallel jobs to avoid OOM
 %bcond_without limitbuild
-%else
-%bcond_with limitbuild
-%endif
 
 # Shared library SONAME versions
 %ifarch hppa
@@ -239,7 +233,7 @@ BuildRequires: texinfo
 BuildRequires: gcc-c++
 BuildRequires: glibc-devel-32bit
 %if %{with limitbuild}
-BuildRequires:  memory-constraints
+BuildRequires: memory-constraints
 %endif
 BuildRequires: mpc-devel
 BuildRequires: mpfr-devel
diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec
index 9cba812..7a8b40c 100644
--- a/gcc13-testresults.spec
+++ b/gcc13-testresults.spec
@@ -37,8 +37,6 @@
 
 # nospeccleaner
 
-%global flavor @BUILD_FLAVOR@%{nil}
-
 %if 0%{?suse_version} < 1550
 %define _slibdir  /%{_lib}
 %define slibdir   /lib
@@ -149,12 +147,8 @@
 %define build_jit 0
 %endif
 
-# Limit the number of parallel jobs to avoid OOM for gcc13
-%if "%{flavor}" == ""
+# Limit the number of parallel jobs to avoid OOM
 %bcond_without limitbuild
-%else
-%bcond_with limitbuild
-%endif
 
 # Shared library SONAME versions
 %ifarch hppa
diff --git a/gcc13.spec b/gcc13.spec
index 484ffcc..e3804c7 100644
--- a/gcc13.spec
+++ b/gcc13.spec
@@ -16,8 +16,6 @@
 #
 
 
-%global flavor @BUILD_FLAVOR@%{nil}
-
 %if 0%{?suse_version} < 1550
 %define _slibdir  /%{_lib}
 %define slibdir   /lib
@@ -128,12 +126,8 @@
 %define build_jit 0
 %endif
 
-# Limit the number of parallel jobs to avoid OOM for gcc13
-%if "%{flavor}" == ""
+# Limit the number of parallel jobs to avoid OOM
 %bcond_without limitbuild
-%else
-%bcond_with limitbuild
-%endif
 
 # Shared library SONAME versions
 %ifarch hppa