packaging: Force options for native compiler only

If both native and cross-compiler are installed (e. g. in qemu-accel build) the
gcc-force-options should only accelerate native compiler in order to keep
gcc-unforce-options work.

Change-Id: I1454fb199e6f849b89f7b16129e005894d800cbc
Signed-off-by: Slava Barinov <v.barinov@samsung.com>

diff --git a/packaging/gcc-aarch64.spec b/packaging/gcc-aarch64.spec
index cbc4015..70ca3d8 100644 (file)
--- a/packaging/gcc-aarch64.spec
+++ b/packaging/gcc-aarch64.spec
@@ -1027,6 +1027,8 @@ rm -rf %{buildroot}/%{libsubdir}/include
 }
 
 %{!?cross:
+sed -e 's|GCC_LIBSUBDIR|%{libsubdir}|' -i %{SOURCE15}
+
 cp %{SOURCE15} %{SOURCE16} %{SOURCE18} %{buildroot}%{_prefix}/bin
 chmod a+x %{buildroot}%{_prefix}/bin/gcc-force-options
 chmod a+x %{buildroot}%{_prefix}/bin/gcc-unforce-options

diff --git a/packaging/gcc-armv7l.spec b/packaging/gcc-armv7l.spec
index 0ff3c08..eb63ff1 100644 (file)
--- a/packaging/gcc-armv7l.spec
+++ b/packaging/gcc-armv7l.spec
@@ -1027,6 +1027,8 @@ rm -rf %{buildroot}/%{libsubdir}/include
 }
 
 %{!?cross:
+sed -e 's|GCC_LIBSUBDIR|%{libsubdir}|' -i %{SOURCE15}
+
 cp %{SOURCE15} %{SOURCE16} %{SOURCE18} %{buildroot}%{_prefix}/bin
 chmod a+x %{buildroot}%{_prefix}/bin/gcc-force-options
 chmod a+x %{buildroot}%{_prefix}/bin/gcc-unforce-options

diff --git a/packaging/gcc-force-options b/packaging/gcc-force-options
index 0dfdd9a..5813d78 100644 (file)
--- a/packaging/gcc-force-options
+++ b/packaging/gcc-force-options
@@ -113,7 +113,7 @@ fi
 EOF
 chmod +x $LD_TMP
 
-find -L /usr/*/gcc -type f -a -perm -a=x -name 'collect2' | while read tool; do
+find -L GCC_LIBSUBDIR -type f -a -perm -a=x -name 'collect2' | while read tool; do
        mv $tool $tool-real
        cp $LD_TMP $tool
 done

diff --git a/packaging/linaro-gcc.spec b/packaging/linaro-gcc.spec
index e3f41f3..53077f6 100644 (file)
--- a/packaging/linaro-gcc.spec
+++ b/packaging/linaro-gcc.spec
@@ -1024,6 +1024,8 @@ rm -rf %{buildroot}/%{libsubdir}/include
 }
 
 %{!?cross:
+sed -e 's|GCC_LIBSUBDIR|%{libsubdir}|' -i %{SOURCE15}
+
 cp %{SOURCE15} %{SOURCE16} %{SOURCE18} %{buildroot}%{_prefix}/bin
 chmod a+x %{buildroot}%{_prefix}/bin/gcc-force-options
 chmod a+x %{buildroot}%{_prefix}/bin/gcc-unforce-options