summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/import.prebuilt/TARGETS.git22
-rw-r--r--etc/import/TARGETS.boringssl2
-rw-r--r--etc/import/src/TARGETS.archive2
-rw-r--r--etc/import/src/TARGETS.curl2
-rw-r--r--etc/import/src/util/TARGETS.git22
-rw-r--r--etc/repos.json8
-rw-r--r--src/buildtool/common/artifact_factory.hpp1
-rw-r--r--src/buildtool/file_system/TARGETS1
-rw-r--r--src/buildtool/file_system/git_repo.cpp2
-rw-r--r--src/buildtool/logging/TARGETS1
-rw-r--r--src/buildtool/logging/log_sink.hpp1
-rw-r--r--src/buildtool/logging/log_sink_file.hpp1
-rw-r--r--src/buildtool/multithreading/TARGETS1
-rw-r--r--test/buildtool/logging/TARGETS1
-rw-r--r--test/other_tools/just_mr/TARGETS2
-rw-r--r--test/utils/cpp/TARGETS1
16 files changed, 18 insertions, 12 deletions
diff --git a/etc/import.prebuilt/TARGETS.git2 b/etc/import.prebuilt/TARGETS.git2
index ceb3f09d..09d0ebba 100644
--- a/etc/import.prebuilt/TARGETS.git2
+++ b/etc/import.prebuilt/TARGETS.git2
@@ -7,7 +7,7 @@
, "-lutil_hash_openssl"
, "-lgit2_pcre"
, "-lgit2_http_parser"
- , "-lpthread"
+ , "-pthread"
]
}
}
diff --git a/etc/import/TARGETS.boringssl b/etc/import/TARGETS.boringssl
index ed63a8ae..5a853421 100644
--- a/etc/import/TARGETS.boringssl
+++ b/etc/import/TARGETS.boringssl
@@ -57,7 +57,7 @@
, "private-hdrs": ["fips_fragments", "crypto_internal_headers"]
, "srcs": ["crypto_sources", "crypto_sources_asm"]
, "pure C": ["YES"]
- , "private-ldflags": ["-lpthread"]
+ , "private-ldflags": ["-pthread"]
}
, "ssl-lib":
{ "type": ["@", "rules", "CC", "library"]
diff --git a/etc/import/src/TARGETS.archive b/etc/import/src/TARGETS.archive
index a9ee796d..ee3ff78b 100644
--- a/etc/import/src/TARGETS.archive
+++ b/etc/import/src/TARGETS.archive
@@ -6,7 +6,7 @@
{ "type": "if"
, "cond":
{"type": "==", "$1": {"type": "var", "name": "OS"}, "$2": "linux"}
- , "then": ["-lpthread"]
+ , "then": ["-pthread"]
}
}
, "archive_crypt":
diff --git a/etc/import/src/TARGETS.curl b/etc/import/src/TARGETS.curl
index d77766f1..1bfd750a 100644
--- a/etc/import/src/TARGETS.curl
+++ b/etc/import/src/TARGETS.curl
@@ -57,7 +57,7 @@
, "then":
{ "type": "case*"
, "expr": {"type": "var", "name": "OS"}
- , "case": [["linux", ["-lpthread"]]]
+ , "case": [["linux", ["-pthread"]]]
}
}
}
diff --git a/etc/import/src/util/TARGETS.git2 b/etc/import/src/util/TARGETS.git2
index 281d9c46..d3028a74 100644
--- a/etc/import/src/util/TARGETS.git2
+++ b/etc/import/src/util/TARGETS.git2
@@ -80,7 +80,7 @@
, "$1":
[ { "type": "if"
, "cond": {"type": "var", "name": "THREADSAFE"}
- , "then": ["-lpthread"]
+ , "then": ["-pthread"]
}
, { "type": "case"
, "expr": {"type": "var", "name": "OS"}
diff --git a/etc/repos.json b/etc/repos.json
index 4774846e..a0256ddf 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -20,8 +20,8 @@
, "bzip2": "bzip2"
, "libarchive": "com_github_libarchive_libarchive"
}
- , "bootstrap": {"link": ["-lpthread"]}
- , "bootstrap_local": {"link": ["-lpthread"]}
+ , "bootstrap": {"link": ["-pthread"]}
+ , "bootstrap_local": {"link": ["-pthread"]}
}
, "just-distfiles":
{ "repository":
@@ -218,13 +218,13 @@
, "bindings": {"rules": "rules-boringssl"}
, "bootstrap":
{ "build": "SYS=`uname -s | tr 'A-Z' 'a-z'` && ARCH=`uname -m` && {cc} {cflags} -I . -I src/include -c *.c src/crypto/*.c src/crypto/*/*.c $SYS-$ARCH/crypto/fipsmodule/*.S && {ar} cqs libcrypto.a *.o"
- , "link": ["-lcrypto", "-lpthread"]
+ , "link": ["-lcrypto", "-pthread"]
, "include_dir": "src/include/openssl"
, "include_name": "openssl"
}
, "local_bootstrap":
{ "local_path": "include/openssl"
- , "link": ["-lcrypto", "-lpthread"]
+ , "link": ["-lcrypto", "-pthread"]
, "link_dirs": ["lib"]
}
}
diff --git a/src/buildtool/common/artifact_factory.hpp b/src/buildtool/common/artifact_factory.hpp
index c1df088e..64b7d33c 100644
--- a/src/buildtool/common/artifact_factory.hpp
+++ b/src/buildtool/common/artifact_factory.hpp
@@ -23,7 +23,6 @@
#include "src/buildtool/common/action_description.hpp"
#include "src/buildtool/common/artifact.hpp"
-#include "src/buildtool/common/artifact_description.hpp"
#include "src/buildtool/common/identifier.hpp"
#include "src/buildtool/file_system/object_type.hpp"
#include "src/buildtool/logging/logger.hpp"
diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS
index 38df9c2b..04ce95e1 100644
--- a/src/buildtool/file_system/TARGETS
+++ b/src/buildtool/file_system/TARGETS
@@ -98,6 +98,7 @@
, ["src/utils/cpp", "path"]
, ["src/utils/cpp", "hex_string"]
]
+ , "cflags": ["-pthread"]
}
, "git_utils":
{ "type": ["@", "rules", "CC", "library"]
diff --git a/src/buildtool/file_system/git_repo.cpp b/src/buildtool/file_system/git_repo.cpp
index df8c6fad..1eed7eb7 100644
--- a/src/buildtool/file_system/git_repo.cpp
+++ b/src/buildtool/file_system/git_repo.cpp
@@ -14,6 +14,8 @@
#include "src/buildtool/file_system/git_repo.hpp"
+#include <thread>
+
#include "src/buildtool/logging/logger.hpp"
#include "src/utils/cpp/hex_string.hpp"
#include "src/utils/cpp/path.hpp"
diff --git a/src/buildtool/logging/TARGETS b/src/buildtool/logging/TARGETS
index 36b3f9c0..e0b9b6a2 100644
--- a/src/buildtool/logging/TARGETS
+++ b/src/buildtool/logging/TARGETS
@@ -18,5 +18,6 @@
, "deps":
["log_level", ["@", "fmt", "", "fmt"], ["@", "gsl-lite", "", "gsl-lite"]]
, "stage": ["src", "buildtool", "logging"]
+ , "private-ldflags": ["-pthread"]
}
}
diff --git a/src/buildtool/logging/log_sink.hpp b/src/buildtool/logging/log_sink.hpp
index 215ea005..f80b955c 100644
--- a/src/buildtool/logging/log_sink.hpp
+++ b/src/buildtool/logging/log_sink.hpp
@@ -19,7 +19,6 @@
#include <istream>
#include <memory>
#include <string>
-#include <thread>
#include "src/buildtool/logging/log_level.hpp"
diff --git a/src/buildtool/logging/log_sink_file.hpp b/src/buildtool/logging/log_sink_file.hpp
index dca3f72b..b27726a2 100644
--- a/src/buildtool/logging/log_sink_file.hpp
+++ b/src/buildtool/logging/log_sink_file.hpp
@@ -23,6 +23,7 @@
#include <mutex>
#include <sstream>
#include <string>
+#include <thread>
#include <unordered_map>
#ifdef __unix__
diff --git a/src/buildtool/multithreading/TARGETS b/src/buildtool/multithreading/TARGETS
index 79b40a2e..2e5467f4 100644
--- a/src/buildtool/multithreading/TARGETS
+++ b/src/buildtool/multithreading/TARGETS
@@ -3,6 +3,7 @@
, "name": ["task"]
, "hdrs": ["task.hpp"]
, "stage": ["src", "buildtool", "multithreading"]
+ , "private-ldflags": ["-pthread"]
}
, "notification_queue":
{ "type": ["@", "rules", "CC", "library"]
diff --git a/test/buildtool/logging/TARGETS b/test/buildtool/logging/TARGETS
index a14a0fc3..c6046227 100644
--- a/test/buildtool/logging/TARGETS
+++ b/test/buildtool/logging/TARGETS
@@ -20,6 +20,7 @@
, ["src/buildtool/file_system", "file_system_manager"]
]
, "stage": ["test", "buildtool", "logging"]
+ , "private-ldflags": ["-pthread"]
}
, "TESTS":
{"type": "install", "tainted": ["test"], "deps": ["log_sink_file", "logger"]}
diff --git a/test/other_tools/just_mr/TARGETS b/test/other_tools/just_mr/TARGETS
index 15d31445..385cbaef 100644
--- a/test/other_tools/just_mr/TARGETS
+++ b/test/other_tools/just_mr/TARGETS
@@ -13,7 +13,7 @@
, ["src/other_tools/utils", "archive_ops"]
, ["src/utils/cpp", "tmp_dir"]
]
- , "private-ldflags": ["-lpthread"]
+ , "private-ldflags": ["-pthread"]
, "stage": ["src"]
}
, "just_mr_mp":
diff --git a/test/utils/cpp/TARGETS b/test/utils/cpp/TARGETS
index 9da792dc..16daa3c7 100644
--- a/test/utils/cpp/TARGETS
+++ b/test/utils/cpp/TARGETS
@@ -21,6 +21,7 @@
, ["src/utils/cpp", "atomic"]
]
, "stage": ["test", "utils", "cpp"]
+ , "private-ldflags": ["-pthread"]
}
, "TESTS":
{"type": "install", "tainted": ["test"], "deps": ["path", "file_locking"]}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-04 11:27:40 +0000