From fc6d0b6e04175722ce77e40cda613c6b009ec02f Mon Sep 17 00:00:00 2001
From: Simone Basso <bassosimone@gmail.com>
Date: Wed, 22 Mar 2023 08:26:38 +0000
Subject: [PATCH] Revert "try to compile tor using tsan"

This reverts commit 143373422bfdea467b3768f0f016494aeadc335e.
---
 internal/cmd/buildtool/linuxcdeps.go | 31 +++++++++++++---------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/internal/cmd/buildtool/linuxcdeps.go b/internal/cmd/buildtool/linuxcdeps.go
index 5249e9baa7..e238b738af 100644
--- a/internal/cmd/buildtool/linuxcdeps.go
+++ b/internal/cmd/buildtool/linuxcdeps.go
@@ -44,29 +44,26 @@ func linuxCdepsBuildMain(name string, deps buildtoolmodel.Dependencies) {
 		"-fPIC", // makes more sense than -fPIE given that we're building a library
 		"-fsanitize=bounds",
 		"-fsanitize-undefined-trap-on-error",
-		"-fsanitize=thread",
 		"-O2",
 	}
 	destdir := runtimex.Try1(filepath.Abs(filepath.Join( // must be absolute
 		"internal", "libtor", "linux", runtime.GOARCH,
 	)))
 	globalEnv := &cBuildEnv{
-		ANDROID_HOME:     "",
-		ANDROID_NDK_ROOT: "",
-		AR:               "",
-		BINPATH:          "",
-		CC:               "",
-		CFLAGS:           cflags,
-		CONFIGURE_HOST:   "",
-		DESTDIR:          destdir,
-		CXX:              "",
-		CXXFLAGS:         cflags,
-		GOARCH:           "",
-		GOARM:            "",
-		LD:               "",
-		LDFLAGS: []string{
-			"-fsanitize=thread",
-		},
+		ANDROID_HOME:       "",
+		ANDROID_NDK_ROOT:   "",
+		AR:                 "",
+		BINPATH:            "",
+		CC:                 "",
+		CFLAGS:             cflags,
+		CONFIGURE_HOST:     "",
+		DESTDIR:            destdir,
+		CXX:                "",
+		CXXFLAGS:           cflags,
+		GOARCH:             "",
+		GOARM:              "",
+		LD:                 "",
+		LDFLAGS:            []string{},
 		OPENSSL_API_DEFINE: "",
 		OPENSSL_COMPILER:   "linux-x86_64",
 		RANLIB:             "",