From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 12 Mar 2018 14:59:10 +0000 (+0100)
Subject: tools/oss-fuzz: add clang library dir using -L
X-Git-Tag: v239~552^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8423%2Fhead;p=thirdparty%2Fsystemd.git

tools/oss-fuzz: add clang library dir using -L

I have no idea why clang doesn't do this on its own, and why clang
makes it so hard to query this path (-dumpversion returns something
unrelated...).

I know this is an ugly hack, but this is a very specialized script,
so it should be OK to make it a bit hacky.

Tested to work on Fedora (27) and Debian (unstable).

Fixes #8428.
---

diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh
index 2c4e58e29d1..117b3d1aa4e 100755
--- a/tools/oss-fuzz.sh
+++ b/tools/oss-fuzz.sh
@@ -20,13 +20,20 @@ set -ex
 
 export LC_CTYPE=C.UTF-8
 
+export CC=${CC:-clang}
+export CXX=${CXX:-clang++}
+clang_version="$($CC --version | sed -nr 's/.*version ([^ ]+?) .*/\1/p' | sed -r 's/-$//')"
+
 SANITIZER=${SANITIZER:-address -fsanitize-address-use-after-scope}
 flags="-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=$SANITIZER -fsanitize-coverage=trace-pc-guard,trace-cmp"
 
+clang_lib="/usr/lib64/clang/${clang_version}/lib/linux"
+[ -d "$clang_lib" ] || clang_lib="/usr/lib/clang/${clang_version}/lib/linux"
+
 export CFLAGS=${CFLAGS:-$flags}
 export CXXFLAGS=${CXXFLAGS:-$flags}
-export CC=${CC:-clang}
-export CXX=${CXX:-clang++}
+export LDFLAGS=${LDFLAGS:--L${clang_lib}}
+
 export WORK=${WORK:-$(pwd)}
 export OUT=${OUT:-$(pwd)/out}
 mkdir -p $OUT