Index: tools/clang/lib/Tooling/CommonOptionsParser.cpp
===================================================================
--- tools/clang/lib/Tooling/CommonOptionsParser.cpp
+++ tools/clang/lib/Tooling/CommonOptionsParser.cpp
@@ -53,13 +53,13 @@
     "\tsuffix of a path in the compile command database.\n"
     "\n";
 
-static cl::opt<std::string> BuildPath(
-    "p", cl::desc("Build path"), cl::Optional);
+CommonOptionsParser::CommonOptionsParser(int &argc, const char **argv) {
+  static cl::opt<std::string> BuildPath(
+      "p", cl::desc("Build path"), cl::Optional);
 
-static cl::list<std::string> SourcePaths(
-    cl::Positional, cl::desc("<source0> [... <sourceN>]"), cl::OneOrMore);
+  static cl::list<std::string> SourcePaths(
+      cl::Positional, cl::desc("<source0> [... <sourceN>]"), cl::OneOrMore);
 
-CommonOptionsParser::CommonOptionsParser(int &argc, const char **argv) {
   Compilations.reset(FixedCompilationDatabase::loadFromCommandLine(argc,
                                                                    argv));
   cl::ParseCommandLineOptions(argc, argv);