[llvm] r308694 - Only defined CombinedRoot if libxml2 is used.

[Kevin Enderby via llvm-commits]

Hi Eric,

Could you take a look at your change.  I think it cause the failure:

> On Jul 20, 2017, at 4:15 PM, llvm.buildmaster at lab.llvm.org wrote:
> 
> The Buildbot has detected a new failure on builder lld-x86_64-darwin13 while building llvm.
> Full details are available at:
> http://lab.llvm.org:8011/builders/lld-x86_64-darwin13/builds/10748
> 
> Buildbot URL: http://lab.llvm.org:8011/
> 
> Buildslave for this Build: as-bldslv9
> 
> Build Reason: scheduler
> Build Source Stamp: [branch trunk] 308691
> Blamelist: ecbeckmann,enderby
> 
> BUILD FAILED: failed build_Lld
> 
> sincerely,
> -The Buildbot
> 
> 
> 


> On Jul 20, 2017, at 4:14 PM, Eric Beckmann via llvm-commits <llvm-commits at lists.llvm.org> wrote:
> 
> Author: ecbeckmann
> Date: Thu Jul 20 16:14:12 2017
> New Revision: 308694
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=308694&view=rev
> Log:
> Only defined CombinedRoot if libxml2 is used.
> 
> Modified:
>    llvm/trunk/include/llvm/Support/WindowsManifestMerger.h
> 
> Modified: llvm/trunk/include/llvm/Support/WindowsManifestMerger.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/WindowsManifestMerger.h?rev=308694&r1=308693&r2=308694&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Support/WindowsManifestMerger.h (original)
> +++ llvm/trunk/include/llvm/Support/WindowsManifestMerger.h Thu Jul 20 16:14:12 2017
> @@ -67,7 +67,9 @@ private:
>   static void errorCallback(void *Ctx, const char *Format, ...);
>   Error getParseError();
> 
> +#if LLVM_LIBXML2_ENABLED
>   XMLNodeImpl CombinedRoot = nullptr;
> +#endif
>   bool ParseErrorOccurred = false;
> };
> 
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits