tor

commit 185320e080fbc77ff2838b16a3e89f9ffbf9ed26
parent 2934500c3133fa9ea651ee9c29d0e025499c20f8
Author: David Goulet <dgoulet@torproject.org>
Date:   Wed, 21 May 2025 13:33:57 +0000

Merge branch 'bug40176' into 'main'

Fix linking on systems without a working stdatomic.h

See merge request tpo/core/tor!896
Diffstat:
M
Makefile.am
 | 
4
++--
A
changes/bug41076
 | 
3
+++

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
@@ -50,12 +50,12 @@ TOR_UTIL_LIBS = \
 	src/lib/libtor-sandbox.a \
 	src/lib/libtor-container.a \
 	src/lib/libtor-net.a \
-	src/lib/libtor-thread.a \
 	src/lib/libtor-memarea.a \
 	src/lib/libtor-math.a \
 	src/lib/libtor-meminfo.a \
 	src/lib/libtor-osinfo.a \
 	src/lib/libtor-log.a \
+	src/lib/libtor-thread.a \
 	src/lib/libtor-lock.a \
 	src/lib/libtor-fdio.a \
 	src/lib/libtor-string.a \
@@ -86,13 +86,13 @@ TOR_UTIL_TESTING_LIBS = \
 	src/lib/libtor-sandbox-testing.a \
 	src/lib/libtor-container-testing.a \
 	src/lib/libtor-net-testing.a \
-	src/lib/libtor-thread-testing.a \
 	src/lib/libtor-memarea-testing.a \
 	src/lib/libtor-math-testing.a \
 	src/lib/libtor-meminfo-testing.a \
 	src/lib/libtor-osinfo-testing.a \
 	src/lib/libtor-term-testing.a \
 	src/lib/libtor-log-testing.a \
+	src/lib/libtor-thread-testing.a \
 	src/lib/libtor-lock-testing.a \
 	src/lib/libtor-fdio-testing.a \
 	src/lib/libtor-string-testing.a \
diff --git a/changes/bug41076 b/changes/bug41076
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+    - Fix linking on systems without a working stdatomic.h.
+      Fixes bug 41076; bugfix on 0.4.9.1-alpha.