Fix use of LDFLAGS

This commit is contained in:
Nick Clifton 2022-05-28 12:39:19 +01:00
parent 15c0289a28
commit fae26da53a

View File

@ -39,7 +39,7 @@
Summary: A GNU collection of binary utilities Summary: A GNU collection of binary utilities
Name: binutils%{?name_cross}%{?_with_debug:-debug} Name: binutils%{?name_cross}%{?_with_debug:-debug}
Version: 2.38 Version: 2.38
Release: 13%{?dist} Release: 14%{?dist}
License: GPLv3+ License: GPLv3+
URL: https://sourceware.org/binutils URL: https://sourceware.org/binutils
@ -545,14 +545,12 @@ export CFLAGS="$CFLAGS -O0 -ggdb2 -Wno-error -D_FORTIFY_SOURCE=0"
%define enable_shared 0 %define enable_shared 0
%endif %endif
%if %{with clang} %if %{enable_new_dtags}
%define _with_cc_clang 1 export LDFLAGS="$LDFLAGS -Wl,--enable-new-dtags"
%endif %endif
# BZ 1541027 - include the linker flags from redhat-rpm-config as well. %if %{with clang}
export LDFLAGS=$RPM_LD_FLAGS %define _with_cc_clang 1
%if %{enable_new_dtags}
export LDFLAGS="$LD_FLAGS -Wl,--enable-new-dtags"
%endif %endif
CARGS= CARGS=
@ -722,7 +720,7 @@ make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} install-info
%make_build CFLAGS="-g -fPIC $CFLAGS" -C libiberty %make_build CFLAGS="-g -fPIC $CFLAGS" -C libiberty
%if %{enable_new_dtags} %if %{enable_new_dtags}
export LDFLAGS="$RPM_LD_FLAGS -Wl,--enable-new-dtags" export LDFLAGS="$LDFLAGS -Wl,--enable-new-dtags"
%endif %endif
# Rebuild libbfd.a with -fPIC. # Rebuild libbfd.a with -fPIC.
@ -935,6 +933,9 @@ exit 0
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%changelog %changelog
* Fri May 27 2022 Nick Clifton <nickc@redhat.comn> - 2.38-14
- Fix bug in binutils.spec file that was causing the wrong linker flags to be used.
* Fri May 27 2022 Nick Clifton <nickc@redhat.comn> - 2.38-13 * Fri May 27 2022 Nick Clifton <nickc@redhat.comn> - 2.38-13
- Change the ld man page so that it says that --enable-new-dtags is the default. (#2090818) - Change the ld man page so that it says that --enable-new-dtags is the default. (#2090818)