Bug 1427808: Link clang-plugin against clangASTMatchers.lib to fix build. r=froydnj
authorDavid Major <dmajor@mozilla.com>
Tue, 20 Feb 2018 10:54:47 -0500
changeset 456989 0e7c060d72ebdf2fece3def0c96d7c887c8ee33e
parent 456988 d7fe8178c1d91edd5688fc9765d3ebbc655d270f
child 456990 e3ad5ddda361c477feb75aef1272b884ff0c8d5d
push id8799
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 16:46:23 +0000
treeherdermozilla-beta@15334014dc67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1427808
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1427808: Link clang-plugin against clangASTMatchers.lib to fix build. r=froydnj
build/autoconf/clang-plugin.m4
--- a/build/autoconf/clang-plugin.m4
+++ b/build/autoconf/clang-plugin.m4
@@ -52,17 +52,17 @@ if test -n "$ENABLE_CLANG_PLUGIN"; then
         dnl We are loaded into clang, so we don't need to link to very many things,
         dnl we just need to link to clangASTMatchers because it is not used by clang
         CLANG_LDFLAGS="$CLANG_LDFLAGS `$LLVMCONFIG --prefix`/lib/libclangASTMatchers.a"
         dnl We need to remove -L/path/to/clang/lib from LDFLAGS to ensure that we
         dnl don't accidentally link against the libc++ there which is a newer
         dnl version that what our build machines have installed.
         LLVM_LDFLAGS=`echo "$LLVM_LDFLAGS" | sed -E 's/-L[[^ ]]+\/clang\/lib//'`
     elif test "${HOST_OS_ARCH}" = "WINNT"; then
-        CLANG_LDFLAGS="clang.lib"
+        CLANG_LDFLAGS="clang.lib clangASTMatchers.lib"
     else
         CLANG_LDFLAGS="-lclangASTMatchers"
     fi
 
     if test -n "$CLANG_CL"; then
         dnl The llvm-config coming with clang-cl may give us arguments in the
         dnl /ARG form, which in msys will be interpreted as a path name.  So we
         dnl need to split the args and convert the leading slashes that we find