[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib

[Peter Foley]

 bin/gen-iwyu-dummy-lib |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bee5797feb1b663fe308c18b4d5d6c16b05cda1b
Author: Peter Foley <pefoley2 at pefoley.com>
Date:   Sun Jan 17 09:40:47 2016 -0500

    iwyu fixes
    
    Change-Id: I2dc9218ae8c4ea51fea5f710664520a598e7c4a3
    Reviewed-on: https://gerrit.libreoffice.org/21536
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib
index 92ec408..1d47f04 100755
--- a/bin/gen-iwyu-dummy-lib
+++ b/bin/gen-iwyu-dummy-lib
@@ -23,7 +23,7 @@ iwyu_INCLUDES=$(grep -h -r ":$" ${BUILDDIR}/workdir/Dep/*Object* \
 iwyu_INCLUDEDIRS=$(echo "${iwyu_INCLUDES}" | sed -e "s,/[^/]*$,," | grep -v "^include" | sort -u)
 
 iwyu_EXTERNALS=$(ls ${SRCDIR}/*/*Library*mk ${SRCDIR}/*/*Executable*mk \
-    | xargs awk -f bin/gen-iwyu-dummy-lib.awk \
+    | xargs awk -f ${SRCDIR}/bin/gen-iwyu-dummy-lib.awk \
     | grep -v '$(\|)\|tde\|expat_x64\|zlib_x64\|mozilla\|apr\|serf')
 
 mkdir -p ${BUILDDIR}/iwyudummy
@@ -62,7 +62,7 @@ for dir in $(echo ${iwyu_INCLUDEDIRS_EXTRA} | sed -e "s/ /\n/g" | uniq) ${iwyu_I
     echo "-I${SRCDIR}/${dir} \\";
 done >> ${iwyu_LIB}
 # it fails to find stddef.h?
-echo '-I/usr/lib/clang/3.6/include \' >> ${iwyu_LIB}
+echo "-I/usr/lib/clang/$(llvm-config --version)/include \\" >> ${iwyu_LIB}
 echo "))" >> ${iwyu_LIB} >> ${iwyu_LIB}
 
 echo '$(eval $(call gb_StaticLibrary__add_iwyu_headers,iwyudummy,\' >> ${iwyu_LIB}