commit d113788ecb47b277969baad6ca1b8452ce3fc4df
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Sun May 04 05:27:24 2014 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Sun May 04 05:27:24 2014 +0000
tree 0036d9e74f37c1b6316691acdfd4d12a8472dafd
parent 027731d7b514123af03287b42d7366291b58d6e0

Speculative fix to unbreak the buildbots that fail with compiler errors.

llvm-svn: 207933

clang/lib/Frontend/CompilerInvocation.cpp

diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 25bb881..f499ae0 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -1844,11 +1844,11 @@
   }
 
   // Extend the signature with the sysroot.
-  code = hash_combine(code, hsOpts.Sysroot, hsOpts.ResourceDir,
-                      hsOpts.UseBuiltinIncludes,
+  code = hash_combine(code, hsOpts.Sysroot, hsOpts.UseBuiltinIncludes,
                       hsOpts.UseStandardSystemIncludes,
                       hsOpts.UseStandardCXXIncludes,
                       hsOpts.UseLibcxx);
+  code = hash_combine(code, hsOpts.ResourceDir);
 
   // Extend the signature with the user build path.
   code = hash_combine(code, hsOpts.ModuleUserBuildPath);