about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2013-06-10 10:08:46 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2013-06-10 10:08:46 +0530
commit50b818bf96072fda433f7df4c307639b25e4da57 (patch)
treeb576b55067dd805331b915c5500c286ec902dcda
parent416641e6879a08a859c90fc8a84802eb37f5fa8a (diff)
downloadglibc-50b818bf96072fda433f7df4c307639b25e4da57.tar.gz
glibc-50b818bf96072fda433f7df4c307639b25e4da57.tar.xz
glibc-50b818bf96072fda433f7df4c307639b25e4da57.zip
Avoid overwriting earlier flags in CPPFLAGS-nonlib in benchtests
When setting BENCH_DURATION in CPPFLAGS-nonlib, append to the variable
instead of assigning to it, to avoid overwriting earlier set flags,
notably the -DNOT_IN_libc=1 flag.
-rw-r--r--ChangeLog5
-rw-r--r--benchtests/Makefile2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 94bad3397e..e8de668002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-10  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* benchtests/Makefile (CPPFLAGS-nonlib): Append values instead
+	of assigning.
+
 2013-06-08  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/gnu/errlist.awk: Do not generate space at end of
diff --git a/benchtests/Makefile b/benchtests/Makefile
index 67728537a8..680440f429 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -102,7 +102,7 @@ ifndef BENCH_DURATION
 BENCH_DURATION := 10
 endif
 
-CPPFLAGS-nonlib = -DDURATION=$(BENCH_DURATION)
+CPPFLAGS-nonlib += -DDURATION=$(BENCH_DURATION)
 
 # Use clock_gettime to measure performance of functions.  The default is to use
 # HP_TIMING if it is available.