Fixed a minor merge error with this patch.

llvm-svn: 354908

compiler-rt/test/lit.common.cfg

@@ -388,7 +388,7 @@ try:
       [os.path.join(config.llvm_tools_dir, 'llvm-config'), '--assertion-mode'],
       stdout = subprocess.PIPE,
       env=config.environment)
-except OSError:
+except OSError as e:
   print("Could not launch llvm-config in " + config.llvm_tools_dir)
   print("    Failed with error #{0}: {1}".format(e.errno, e.strerror))
   exit(42)