diff --git a/gcc32/gcc32.spec b/gcc32/gcc32.spec index e320c69c78..54f3aedad9 100644 --- a/gcc32/gcc32.spec +++ b/gcc32/gcc32.spec @@ -38,7 +38,7 @@ Distribution: OpenPKG [PLUS] Group: Language License: GPL Version: %{V_full} -Release: 20030702 +Release: 20030704 # package options %option with_cxx yes @@ -183,6 +183,13 @@ Provides: gcc = %{version}-%{release} # cleanup installation tree mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/ + for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`; do + subdir=`echo "$multilib" | sed -e 's/;.*$//'` + [ ".$subdir" = .. ] && continue + mv $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir/lib*.a \ + $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/$subdir/ + rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir + done mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/include/ \ >/dev/null 2>&1 || true