Accepting request 967876 from devel:tools:compiler

OBS-URL: https://build.opensuse.org/request/show/967876
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mold?expand=0&rev=9

mold.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  8 15:40:19 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Set LIBEXECDIR
+- Disable default stripping
+
 -------------------------------------------------------------------
 Tue Mar  8 12:07:34 UTC 2022 - Martin Liška <mliska@suse.cz>
 

mold.spec

@@ -38,9 +38,9 @@ BuildRequires:  zlib-devel
 PreReq:         update-alternatives
 
 %if %{suse_version} < 1550
-%define build_args SYSTEM_XXHASH=1
+%define build_args STRIP=true SYSTEM_XXHASH=1
 %else
-%define build_args SYSTEM_TBB=1 SYSTEM_XXHASH=1 SYSTEM_MIMALLOC=1
+%define build_args STRIP=true SYSTEM_TBB=1 SYSTEM_XXHASH=1 SYSTEM_MIMALLOC=1
 %endif
 
 %description
@@ -61,16 +61,27 @@ export CXX=g++-10
 export CC=gcc
 export CXX=g++
 %endif
-export MANDIR=%{_mandir}
-export LIBDIR=%{_libdir}
-export BINDIR=%{_bindir}
-
 export CXXFLAGS="%{optflags} -Wno-sign-compare"
-export LDFLAGS="${CXXFLAGS}"
+
-%make_build %{build_args} CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+%make_build -e \
+CXXFLAGS="${CXXFLAGS}" \
+LDFLAGS="${CXXFLAGS}" \
+PREFIX=%{_prefix} \
+BINDIR=%{_bindir} \
+MANDIR=%{_mandir} \
+LIBDIR=%{_libdir} \
+LIBEXECDIR=%{_libexecdir} \
+%{build_args}
+
 
 %install
-%make_install PREFIX=%{_prefix} BINDIR=%{_bindir} MANDIR=%{_mandir} LIBDIR=%{_libdir} %{build_args}
+%make_install -e \
+PREFIX=%{_prefix} \
+BINDIR=%{_bindir} \
+MANDIR=%{_mandir} \
+LIBDIR=%{_libdir} \
+LIBEXECDIR=%{_libexecdir} \
+%{build_args}
 
 %post
 "%_sbindir/update-alternatives" --install \
@@ -92,14 +103,8 @@ fi
 %{_bindir}/ld.mold
 %{_bindir}/ld64.mold
 %dir %{_libdir}/mold
-%{_prefix}/libexec/mold/ld
-%if %{suse_version} < 1550
-%dir %{_prefix}/libexec
-%dir %{_prefix}/libexec/mold
-%else
 %{_libexecdir}/mold/ld
 %dir %{_libexecdir}/mold
-%endif
 %{_libdir}/mold/mold-wrapper.so
 %{_mandir}/man1/mold.1.gz