From: Nicholas Nethercote <njn@valgrind.org>
Date: Mon, 13 Jul 2009 22:20:00 +0000 (+0000)
Subject: Fix a couple of tests that could be built with the wrong options, including
X-Git-Tag: svn/VALGRIND_3_5_0~407
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=571595513204d3e6ca1b3ce09533a7fbcd451fdb;p=thirdparty%2Fvalgrind.git

Fix a couple of tests that could be built with the wrong options, including
the -m32/-m64 option.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10440
---

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 250380974d..0b9e0f55aa 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -237,6 +237,8 @@ AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
 
 if VGCONF_OS_IS_DARWIN
 atomic_incs_CFLAGS = $(AM_CFLAGS) -mdynamic-no-pic
+else
+atomic_incs_CFLAGS = $(AM_CFLAGS)
 endif
 
 deep_templates_SOURCES	= deep_templates.cpp
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 46353e8c7c..44e2636a4c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,5 +27,7 @@ AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
 
 if VGCONF_OS_IS_DARWIN
 x86_amd64_features_CFLAGS = $(AM_CFLAGS) -mdynamic-no-pic
+else
+x86_amd64_features_CFLAGS = $(AM_CFLAGS)
 endif