diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt
index 23f1bc15207afa88e991cf2c341f96b8457f9658..29b1925e2b63a90755c71683bdc747a1a82f61ab 100644
--- a/compiler-rt/lib/tsan/CMakeLists.txt
+++ b/compiler-rt/lib/tsan/CMakeLists.txt
@@ -4,9 +4,9 @@ set(TSAN_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 # SANITIZER_COMMON_CFLAGS contains -fPIC, but it's performance-critical for
 # TSan runtime to be built with -fPIE to reduce the number of register spills.
 # On FreeBSD however it provokes linkage issue thus we disable it.
-if(NOT CMAKE_SYSTEM MATCHES "FreeBSD")
-  append_list_if(COMPILER_RT_HAS_FPIE_FLAG -fPIE TSAN_CFLAGS)
-endif()
+# if(NOT CMAKE_SYSTEM MATCHES "FreeBSD")
+	#  append_list_if(COMPILER_RT_HAS_FPIE_FLAG -fPIE TSAN_CFLAGS)
+# endif()
 append_rtti_flag(OFF TSAN_CFLAGS)
 
 if(COMPILER_RT_TSAN_DEBUG_OUTPUT)
diff --git a/llvm-build/build.py b/llvm-build/build.py
index f35164454c3ba54471f30fb8b4cdb5b4a2f8d582..15e265e97fa2ddbbf9bb37f0e56e7957b243c3dd 100755
--- a/llvm-build/build.py
+++ b/llvm-build/build.py
@@ -2271,7 +2271,7 @@ class LlvmPackage(BuildUtils):
         repo_tool = os.path.join(self.build_config.REPOROOT_DIR, '.repo', 'repo', 'repo')
         if os.path.isfile(repo_tool):
             self.logger().info('Generating manifest.')
-            subprocess.run(['python2.7', repo_tool, 'manifest', '-r', '-o', manifest], shell=False,
+            subprocess.run(['python', repo_tool, 'manifest', '-r', '-o', manifest], shell=False,
                            stdout=subprocess.PIPE, cwd=self.build_config.REPOROOT_DIR)
         else:
             self.logger().error('Cannot generate manifest, repo tool not found.')