Bootstrap

SPECS/binutils.spec

@@ -9,7 +9,7 @@ BuildRequires: scl-utils-build
 Summary: A GNU collection of binary utilities
 Name: %{?scl_prefix}binutils
 Version: 2.40
-Release: 14%{?dist}
+Release: 14%{?dist}.bootstrap
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -84,7 +84,7 @@ URL: https://sourceware.org/binutils
 %endif
 
 # Default: Not bootstrapping.
-%bcond_with bootstrap
+%bcond_without bootstrap
 # Default: Not debug
 %bcond_with debug
 # Default: Always build documentation.
@@ -299,15 +299,15 @@ BuildRequires: clang compiler-rt
 # (libfd.a, libopcodes.a libiberty.a libsframe.a) use the same LTO version as the one
 # that will be used by consumers of GTS binutils.
 # Note - during GTS bootstrap these have to be changed to the systemOS versions.
-BuildRequires: %{?scl_prefix}gcc
-BuildRequires: %{?scl_prefix}annobin-plugin-gcc
-BuildRequires: %{?scl_prefix}gcc-c++
-%define gcc_for_libraries %{?_scl_root}/usr/bin/gcc
-%define gxx_for_libraries %{?_scl_root}/usr/bin/g++
+BuildRequires: gcc
+BuildRequires: annobin-plugin-gcc
+BuildRequires: gcc-c++
+%define gcc_for_libraries /usr/bin/gcc
+%define gxx_for_libraries /usr/bin/g++
 
 # Note - during GTS bootstrap it may be necessary to build the binutils without
 # annobin annotations.
-# %%undefine _annotated_build
+%%undefine _annotated_build
 
 %endif
 
@@ -1212,8 +1212,8 @@ exit 0
 %{_libdir}/lib*.so.*
 %exclude %{_libdir}/libbfd.so
 %exclude %{_libdir}/libopcodes.so
-%exclude %{_libdir}/libctf.a
-%exclude %{_libdir}/libctf-nobfd.a
+# %exclude %{_libdir}/libctf.a
+# %exclude %{_libdir}/libctf-nobfd.a
 
 %dir %{_libdir}/bfd-plugins
 # %%{_libdir}/bfd-plugins/libdep.a