aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-08-21 19:28:54 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-08-21 19:28:54 +0200
commit4504783c0f65b7074204c6126c6255ed89d6594e (patch)
tree4dff346e2d1b27ddbacded0b3f2b07e405855bd5 /benchtests/Makefile
parentassert: Support types without operator== (int) [BZ #21972] (diff)
downloadglibc-4504783c0f65b7074204c6126c6255ed89d6594e.tar.gz
glibc-4504783c0f65b7074204c6126c6255ed89d6594e.tar.bz2
glibc-4504783c0f65b7074204c6126c6255ed89d6594e.zip
benchtests: Do not compile benchmark objects as libc modules [BZ #21864]
Otherwise, this will lead to link failures due to hidden symbol references.
Diffstat (limited to 'benchtests/Makefile')
-rw-r--r--benchtests/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/benchtests/Makefile b/benchtests/Makefile
index 37788e8c31..a0c3470398 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -93,6 +93,11 @@ $(objpfx)bench-malloc-thread: $(shared-thread-library)
# affect their performance.
.NOTPARALLEL:
+bench-extra-objs = json-lib.o
+
+extra-objs += $(bench-extra-objs)
+others-extras = $(bench-extra-objs)
+
include ../Rules
binaries-bench := $(addprefix $(objpfx)bench-,$(bench))
@@ -125,10 +130,6 @@ cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
lib := nonlib
include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
-bench-extra-objs = json-lib.o
-
-extra-objs += $(bench-extra-objs)
-
bench-deps := bench-skeleton.c bench-timing.h Makefile
run-bench = $(test-wrapper-env) \