diff --git a/macros b/macros index 91a1493..e8384c7 100644 --- a/macros +++ b/macros @@ -93,7 +93,6 @@ # not been set already. RPM_OPT_FLAGS and RPM_LD_FLAGS have already # been set implicitly at the start of the %%build section. # LT_SYS_LIBRARY_PATH is used by libtool script. -# CCC_OVERRIDE_OPTIONS is used by clang. %set_build_flags \ CFLAGS="${CFLAGS:-%{build_cflags}}" ; export CFLAGS ; \ CXXFLAGS="${CXXFLAGS:-%{build_cxxflags}}" ; export CXXFLAGS ; \ @@ -105,24 +104,6 @@ CXX=%{__cxx}; export CXX ; \ %{nil} -# These commands are used by clang to alter its command line before -# processing. The # character is there to turn off clang's verbose output -# from processing the instructions. Remove it if you need to debug them. -# Note however that doing so puts extra text into stderr which will show up -# as errors for configure tests. -# The -fstack-clash-protection option is removed because it is not supported -# by clang prior to version 10. The spec files are removed because they are -# ignored by clang, and just clutter the command line. The -# redhat-hardened-clang.cfg file is added and it contains clang specific -# hardening options. -%__clang_override_options #\ - x-fstack-clash-protection \ - x-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 \ - x-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 \ - x-specs=/usr/lib/rpm/redhat/redhat-hardened-ld \ - ^/usr/lib/rpm/redhat/redhat-hardened-clang.cfg \ - ^--config - # Internal-only. Do not use. Expand a variable and strip the flags # not suitable to extension builders. %__extension_strip_flags() %{lua: