646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
26 lines
974 B
Diff
26 lines
974 B
Diff
Manually tell the compiler that strlcpy exists. The `try-build` function seems
|
|
somewhat broken, i.e. any code that I try to pass to it doesn't link because of an
|
|
"undefined reference to main" error (and some more quoting issues with newlines being
|
|
swalloed).
|
|
|
|
Because both musl and glibc seemt o support strlcpy nowadays, I decided to just skip the
|
|
possibly broken feature-check and hardcode that it exists.
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index ed2414b..37be9cd 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -239,10 +239,8 @@ endif
|
|
# On a given system, some libs may link statically, some may not; so, check
|
|
# both and only build those that link!
|
|
|
|
-ifeq ($(call try-build,$(SOURCE_STRLCPY),$(CFLAGS),$(LDFLAGS)),y)
|
|
- CFLAGS_DYNOPT += -DHAVE_STRLCPY
|
|
- CFLAGS_STATOPT += -DHAVE_STRLCPY
|
|
-endif
|
|
+CFLAGS_DYNOPT += -DHAVE_STRLCPY
|
|
+CFLAGS_STATOPT += -DHAVE_STRLCPY
|
|
|
|
ifeq ($(call try-build,$(SOURCE_BFD),$(CFLAGS),$(LDFLAGS) -lbfd -static),y)
|
|
CFLAGS_STATOPT += -DCONFIG_HAS_BFD
|