Fix python-lint build

Author: CodaFi

utils/build-script

@@ -599,11 +599,13 @@ class BuildScriptInvocation(object):
                 toolchain=self.toolchain,
                 source_dir=self.workspace.source_dir(product_name),
                 # FIXME: This is incorrect
-                build_dir=self.workspace.build_dir(args.host_target, product_name))
+                build_dir=self.workspace.build_dir(
+                    args.host_target, product_name))
+            cmake_opts = product.cmake_options
             impl_args += [
                 "--%s-cmake-options=%s" % (
                     product_name,
-                    ' '.join(pipes.quote(opt) for opt in product.cmake_options))
+                    ' '.join(pipes.quote(opt) for opt in cmake_opts))
             ]
 
         if args.build_stdlib_deployment_targets:

utils/swift_build_support/swift_build_support/products/swift.py

@@ -21,12 +21,11 @@ def __init__(self, args, toolchain, source_dir, build_dir):
         # Add any runtime sanitizer arguments.
         self.cmake_options.extend(self._compute_runtime_use_sanitizer())
 
-
     def _compute_runtime_use_sanitizer(self):
         sanitizer_list = []
         if self.args.enable_tsan_runtime:
             sanitizer_list += ['Thread']
         if len(sanitizer_list) == 0:
             return []
-        return ["-DSWIFT_RUNTIME_USE_SANITIZERS=%s" % \
-            ";".join(sanitizer_list)]
+        return ["-DSWIFT_RUNTIME_USE_SANITIZERS=%s" %
+                ";".join(sanitizer_list)]

utils/swift_build_support/tests/products/test_swift.py

@@ -75,4 +75,5 @@ def test_swift_runtime_tsan(self):
             toolchain=self.toolchain,
             source_dir='/path/to/src',
             build_dir='/path/to/build')
-        self.assertEqual(swift.cmake_options, ['-DSWIFT_RUNTIME_USE_SANITIZERS=Thread'])
+        self.assertEqual(swift.cmake_options,
+                         ['-DSWIFT_RUNTIME_USE_SANITIZERS=Thread'])