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.

diff --git a/ChangeLog b/ChangeLog
index 94bad3397e93080b9f17246c3b94e56169991990..e8de6680023b5ac49487c769f1cec0e20620809e 100644 (file)
--- 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 67728537a816a06dac83585f5541e9636d6e9be2..680440f429769a77ac77f1a1c03b323495f14701 100644 (file)
--- 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.