packaging: Remove full path from ld.so.preload and add libcrypt to asan-runtime-env...

Do not use full path from ld.so.preload because it causes error
during build. Also set libcrypt-2.30.so to asan-runtime-env
ld.so.preload.

Change-Id: Ic0406b51976a5ed5e3c96d5103e92e831039576d
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/packaging/gcc-contrib.spec b/packaging/gcc-contrib.spec
index 6c34cf012956f65355d9ab687487c2346826160c..281dd5e9fb4c50b3ebf5a9af93d24639a681c563 100644 (file)
--- a/packaging/gcc-contrib.spec
+++ b/packaging/gcc-contrib.spec
@@ -359,8 +359,8 @@ Asan build environment
 %post -n asan-build-env
 # Add /usr/lib/libasan.so to /etc/ld.so.preload
 [ -f /etc/ld.so.preload ] && mv -v /etc/ld.so.preload /etc/ld.so.preload.orig
-echo "%{_libdir}/libasan.so" > /etc/ld.so.preload
-echo "%{_libdir}/libcrypt-2.30.so" >> /etc/ld.so.preload
+echo "libasan.so" > /etc/ld.so.preload
+echo "libcrypt-2.30.so" >> /etc/ld.so.preload
 [ -f /etc/ld.so.preload.orig ] && cat /etc/ld.so.preload.orig >> /etc/ld.so.preload
 
 %preun -n asan-build-env
@@ -515,7 +515,8 @@ echo "%{lsan_runtime_options}"  | tee LSAN_OPTIONS
 echo "%{tsan_runtime_options}"  | tee TSAN_OPTIONS
 echo "%{ubsan_runtime_options}" | tee UBSAN_OPTIONS
 
-echo "%{libdir}/libasan.so" | tee asan-runtime-ld.so.preload
+echo "libasan.so" | tee asan-runtime-ld.so.preload
+echo "libcrypt-2.30.so" | tee -a asan-runtime-ld.so.preload
 
 %ifarch x86_64
 gcc -shared -o libhwasan.so -fPIC hwasan_stub.c