From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon, 10 Jun 2013 04:38:46 +0000 (+0530)
Subject: Avoid overwriting earlier flags in CPPFLAGS-nonlib in benchtests
X-Git-Tag: glibc-2.18~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50b818bf96072fda433f7df4c307639b25e4da57;p=thirdparty%2Fglibc.git

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 94bad3397e9..e8de6680023 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 67728537a81..680440f4297 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.