diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index 8a6bd77e401..2c699d94888 100644
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -48,8 +48,9 @@ static Option *getOption(const std::string &Str) {
 }
 
 static std::vector<Option*> &getPositionalOpts() {
-  static std::vector<Option*> Positional;
-  return Positional;
+  static std::vector<Option*> *Positional = 0;
+  if (!Positional) Positional = new std::vector<Option*>();
+  return *Positional;
 }
 
 static void AddArgument(const char *ArgName, Option *Opt) {