diff options
| author | Slava Barinov <v.barinov@samsung.com> | 2017-08-10 10:24:13 +0300 |
|---|---|---|
| committer | Slava Barinov <v.barinov@samsung.com> | 2017-08-10 12:47:53 +0300 |
| commit | b112bfee673229c2b951a19afad96911bad02694 (patch) | |
| tree | 1f04465cfecd0e3a98185fe6661f757c7c81e65c | |
| parent | 3325c20b1371d4f708020435d8d0787e39304d48 (diff) | |
| download | qemu-accel-b112bfee673229c2b951a19afad96911bad02694.tar.gz qemu-accel-b112bfee673229c2b951a19afad96911bad02694.tar.bz2 qemu-accel-b112bfee673229c2b951a19afad96911bad02694.zip | |
Unforce options in ASan projectssubmit/tizen_base/20170830.083645accepted/tizen/base/20170908.223814
gcc_force_options replaces compiler binaries with scripts and therefore these
binaries can't be successfully packed into rpm package.
Change-Id: I14cc613a0d17d7eae805f67e957ce392f7a56eaa
Signed-off-by: Slava Barinov <v.barinov@samsung.com>
| -rw-r--r-- | packaging/qemu-accel-aarch64.spec | 9 | ||||
| -rw-r--r-- | packaging/qemu-accel-armv7l.spec | 9 | ||||
| -rw-r--r-- | packaging/qemu-accel.spec.in | 9 |
3 files changed, 9 insertions, 18 deletions
diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec index 7e735c5..82cda59 100644 --- a/packaging/qemu-accel-aarch64.spec +++ b/packaging/qemu-accel-aarch64.spec @@ -107,6 +107,9 @@ This package is used in qemu-accel to accelerate clang compiler. %prep %build +%if 0%{?asan} || 0%{?ubsan} +%gcc_unforce_options +%endif %install set +x @@ -122,12 +125,6 @@ binaries="%{_libdir}/libnsl.so.1 %{_libdir}/libnss_compat.so.2" # loaded via dlo LD="/%{_lib}/ld-linux-x86-64.so.2" %endif -# Check if we use toolchain with sanitizers support -[ -f /usr/bin/gcc-force-options ] && sanitizer_enabled=1 -if [ x"$sanitizer_enabled" == x"1" ]; then - real_compiler=`find %{_bindir} -name '*-real' -printf '%{_bindir}/%%f '` -fi - for executable in $LD \ %{_bindir}/bash \ %{_bindir}/{rpm,rpm2cpio,rpmdb,rpmkeys,rpmqpack,rpmbuild,rpmsign,rpmspec} \ diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec index fb7c359..3234811 100644 --- a/packaging/qemu-accel-armv7l.spec +++ b/packaging/qemu-accel-armv7l.spec @@ -107,6 +107,9 @@ This package is used in qemu-accel to accelerate clang compiler. %prep %build +%if 0%{?asan} || 0%{?ubsan} +%gcc_unforce_options +%endif %install set +x @@ -122,12 +125,6 @@ binaries="%{_libdir}/libnsl.so.1 %{_libdir}/libnss_compat.so.2" # loaded via dlo LD="/%{_lib}/ld-linux-x86-64.so.2" %endif -# Check if we use toolchain with sanitizers support -[ -f /usr/bin/gcc-force-options ] && sanitizer_enabled=1 -if [ x"$sanitizer_enabled" == x"1" ]; then - real_compiler=`find %{_bindir} -name '*-real' -printf '%{_bindir}/%%f '` -fi - for executable in $LD \ %{_bindir}/bash \ %{_bindir}/{rpm,rpm2cpio,rpmdb,rpmkeys,rpmqpack,rpmbuild,rpmsign,rpmspec} \ diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in index e073b71..6c17e66 100644 --- a/packaging/qemu-accel.spec.in +++ b/packaging/qemu-accel.spec.in @@ -104,6 +104,9 @@ This package is used in qemu-accel to accelerate clang compiler. %prep %build +%if 0%{?asan} || 0%{?ubsan} +%gcc_unforce_options +%endif %install set +x @@ -119,12 +122,6 @@ binaries="%{_libdir}/libnsl.so.1 %{_libdir}/libnss_compat.so.2" # loaded via dlo LD="/%{_lib}/ld-linux-x86-64.so.2" %endif -# Check if we use toolchain with sanitizers support -[ -f /usr/bin/gcc-force-options ] && sanitizer_enabled=1 -if [ x"$sanitizer_enabled" == x"1" ]; then - real_compiler=`find %{_bindir} -name '*-real' -printf '%{_bindir}/%%f '` -fi - for executable in $LD \ %{_bindir}/bash \ %{_bindir}/{rpm,rpm2cpio,rpmdb,rpmkeys,rpmqpack,rpmbuild,rpmsign,rpmspec} \ |