diff options
| author | Arjun Shankar <arjun@redhat.com> | 2021-01-26 18:14:19 +0100 |
|---|---|---|
| committer | Arjun Shankar <arjun@redhat.com> | 2021-01-26 18:14:19 +0100 |
| commit | 3725ee39dbd4d7c17fc276b3ea4248cc16e4b522 (patch) | |
| tree | e0360b18081f4fc116a8904866c159c0fe5353b2 | |
| parent | 04c6a8073d1c9d73c4a88b536aeb803b12fbffdc (diff) | |
| download | glibc-3725ee39dbd4d7c17fc276b3ea4248cc16e4b522.tar.gz | |
benchtests: Do not build bench-timing-type with MODULE_NAME=libc
Since commit 2682695e5c7a, `make bench-build' with `--enable-static-pie'
fails due to bench-timing-type being incorrectly built with MODULE_NAME
set to `libc'. This commit sets MODULE_NAME to nonlib, thus fixing the
build failure.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
| -rw-r--r-- | benchtests/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/benchtests/Makefile b/benchtests/Makefile index 4cd99deb33..12bd25a57c 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -156,13 +156,6 @@ ifdef DETAILED DETAILED_OPT := -d endif -# This makes sure CPPFLAGS-nonlib and CFLAGS-nonlib are passed -# for all these modules. -cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \ - $(binaries-bench-malloc:=.c) -lib := nonlib -include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) - bench-deps := bench-skeleton.c bench-timing.h Makefile run-bench = $(test-wrapper-env) \ @@ -171,6 +164,13 @@ run-bench = $(test-wrapper-env) \ timing-type := $(objpfx)bench-timing-type +# This makes sure CPPFLAGS-nonlib and CFLAGS-nonlib are passed +# for all these modules. +cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \ + $(binaries-bench-malloc:=.c) $(timing-type:=.c) +lib := nonlib +include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) + bench-clean: rm -f $(binaries-bench) $(addsuffix .o,$(binaries-bench)) rm -f $(binaries-benchset) $(addsuffix .o,$(binaries-benchset)) |