Stop dropping LDFLAGS on shared libraries

Re-add the contents of LDFLAGS to CMAKE_SHARED_LINKER_FLAGS in order to
guarantee that linker parameters are used when linking shared libraries.

Fixes: 26f02f62c3 ("Fix CET support")

Resolves: rhbz#2222040
This commit is contained in:
Tulio Magno Quites Machado Filho 2023-08-04 13:38:10 -03:00
parent f009a3b7e9
commit b758d604f4

View File

@ -81,7 +81,7 @@ ver:rc%{rc_ver}}.src
Name: %{pkg_name}
Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
Release: 3%{?dist}
Release: 4%{?dist}
Summary: The Low Level Virtual Machine
License: Apache-2.0 WITH LLVM-exception OR NCSA
@ -359,7 +359,7 @@ export ASMFLAGS="%{build_cflags}"
-DLLVM_INSTALL_SPHINX_HTML_DIR=%{_pkgdocdir}/html \
-DSPHINX_EXECUTABLE=%{_bindir}/sphinx-build-3 \
-DLLVM_INCLUDE_BENCHMARKS=OFF \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,cet-report=error"
-DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS -Wl,-z,cet-report=error"
# Build libLLVM.so first. This ensures that when libLLVM.so is linking, there
# are no other compile jobs running. This will help reduce OOM errors on the
@ -651,6 +651,9 @@ fi
%endif
%changelog
* Fri Aug 04 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.6-4
- Re-add LDFLAGS to shared libraries
* Thu Aug 03 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.6-3
- Fix rhbz #2226795