Bug 1427808 - Fix libs for clang-plugin build. r=froydnj
authorDavid Major <dmajor@mozilla.com>
Fri, 12 Oct 2018 07:14:00 -0400
changeset 496681 c8e0e2a2d30976c4843ff8955374cc5e32b815fc
parent 496680 99483ca5d3c61c9cfcc6d36f243769a454ab74e1
child 496682 5f551081abcba592d7b404b7975d46e42e5e7984
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1427808
milestone64.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 - Fix libs for clang-plugin 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 clangASTMatchers.lib"
+        CLANG_LDFLAGS="clangASTMatchers.lib clang.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