From: Julian Seward <jseward@acm.org>
Date: Thu, 22 Jan 2009 01:36:51 +0000 (+0000)
Subject: Don't hardwire @FLAG_M32@ in here, since this directory isn't arch
X-Git-Tag: svn/VALGRIND_3_5_0~1066
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5b38a2b949aca11bacee188d4ee6528ae149a27;p=thirdparty%2Fvalgrind.git

Don't hardwire @FLAG_M32@ in here, since this directory isn't arch
specific (and so the build fails eg on a 64 bit machine that does
not have a 32-bit toolchain installed).  Use $(AM_FLAG_M3264_PRI)
instead.



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

diff --git a/memcheck/tests/linux/Makefile.am b/memcheck/tests/linux/Makefile.am
index b0ad79f095..bd713e1679 100644
--- a/memcheck/tests/linux/Makefile.am
+++ b/memcheck/tests/linux/Makefile.am
@@ -9,9 +9,8 @@ check_PROGRAMS = \
 	timerfd-syscall
 
 AM_CPPFLAGS  = -I$(top_srcdir)/include
-AM_CFLAGS    = $(WERROR) @FLAG_M32@ -Winline -Wall -Wshadow -g \
+AM_CFLAGS    = $(WERROR) $(AM_FLAG_M3264_PRI) -Winline -Wall -Wshadow -g \
 		$(FLAG_MMMX) $(FLAG_MSSE)
 AM_CXXFLAGS  = $(AM_CFLAGS)
-AM_CCASFLAGS = @FLAG_M32@
 
 timerfd_syscall_LDADD = -lrt