33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
commit fa616ea3730cb42046d19f28d611be0bc390af7c
|
||
|
|
Author: Sam James <sam@gentoo.org>
|
||
|
|
Date: Sat May 4 13:28:13 2024 +0100
|
||
|
|
|
||
|
|
Revert "Add a test to check for duplicate definitions in the static library"
|
||
|
|
|
||
|
|
This reverts commit ff110b2591f0bdeccd121c3726af19c62d6fb184.
|
||
|
|
|
||
|
|
I had the wrong cherry-pick reference (the commit content is right; it's
|
||
|
|
just referring to a base that isn't upstream), but let's revert and reapply
|
||
|
|
for clarity.
|
||
|
|
|
||
|
|
Signed-off-by: Sam James <sam@gentoo.org>
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 37bf70aa4ad4403f..f7e4eb9ff2cc464c 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -577,13 +577,6 @@ $(objpfx)lint-makefiles.out: scripts/lint-makefiles.sh
|
||
|
|
$(SHELL) $< "$(PYTHON)" `pwd` > $@ ; \
|
||
|
|
$(evaluate-test)
|
||
|
|
|
||
|
|
-# Link libc.a as a whole to verify that it does not contain multiple
|
||
|
|
-# definitions of any symbols.
|
||
|
|
-tests-special += $(objpfx)link-static-libc.out
|
||
|
|
-$(objpfx)link-static-libc.out:
|
||
|
|
- $(LINK.o) $(whole-archive) -r $(objpfx)libc.a -o /dev/null > $@ 2>&1; \
|
||
|
|
- $(evaluate-test)
|
||
|
|
-
|
||
|
|
# Print test summary for tests in $1 .sum file;
|
||
|
|
# $2 is optional test identifier.
|
||
|
|
# Fail if there are unexpected failures in the test results.
|