summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlava Barinov <v.barinov@samsung.com>2017-01-11 17:17:48 +0300
committerSlava Barinov <v.barinov@samsung.com>2017-01-12 11:30:18 +0300
commit926c3a58ce5c3d2cdcd74ccc56f8032f3126025f (patch)
treeadce47250dba1375ca32cc7cf5090b89df86f404
parent5ccc27fee21660ae172563ddfa42cf6741210313 (diff)
downloadlinaro-gcc-sandbox/vbarinov/multilib.tar.gz
linaro-gcc-sandbox/vbarinov/multilib.tar.bz2
linaro-gcc-sandbox/vbarinov/multilib.zip
Add lib32 search path for building *-32bit packagessandbox/vbarinov/multilib
Change-Id: Ib31df81be269ea05f12403dc1b535988e9111b2c Signed-off-by: Slava Barinov <v.barinov@samsung.com>
-rw-r--r--packaging/linaro-gcc.spec6
1 files changed, 4 insertions, 2 deletions
diff --git a/packaging/linaro-gcc.spec b/packaging/linaro-gcc.spec
index 857a42a4e76..894090ac23b 100644
--- a/packaging/linaro-gcc.spec
+++ b/packaging/linaro-gcc.spec
@@ -806,7 +806,9 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m\(arch\|tune\|cpu\)=[^ ]*//g'`
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m\(sse\|fpmath\)[^ ]*//g'`
}
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/ */ /g'`
-
+%ifarch x86_64
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -L/usr/lib32"
+%endif
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" XCFLAGS="$RPM_OPT_FLAGS" \
@@ -923,7 +925,7 @@ ln -s %{_bindir}/cpp %{buildroot}/lib/cpp
# 32-bit libgcc in multilib configuration
%ifarch x86_64
-mv %{buildroot}%{_prefix}/lib/libgcc_s.so* %{buildroot}%{libsubdir}/32/
+mv %{buildroot}%{_prefix}/lib32/libgcc_s.so* %{buildroot}%{libsubdir}/32/
%endif
# move libraries to libdir