diff options
| author | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2006-01-04 01:20:28 +0000 |
|---|---|---|
| committer | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2006-01-04 01:20:28 +0000 |
| commit | 01262145df78ed864f0b638cbb4433a3398c2555 (patch) | |
| tree | 930f3a8351a6b965b58b7cc56a31ab3b3ee9f010 /massif | |
| parent | 3a0158f08e75fa0044df3c9024bb0a2277611024 (diff) | |
Somewhat rehash the biarch-build machinery so as to (1) formalise the
distinction between primary and secondary build targets, and (2) make
it independent of the default behaviour of gcc (iow, what gcc does
when you specify neither -m32 nor -m64).
As a result, an out-of-the-box build on ppc64-linux now builds a
system which is basically for 64-bit PowerPC, but also has the ability
to run 32-bit ppc-linux binaries (exactly the same arrangement as you
get when building on amd64-linux).
There are various twists and turns. multiple-architectures.txt is
updated all the gory details.
This will break amd64 builds until such time as
<tool>/tests/{amd64,x86}/Makefile.am are fixed up (shortly).
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5493 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'massif')
| -rw-r--r-- | massif/hp2ps/Makefile.am | 10 | ||||
| -rw-r--r-- | massif/tests/Makefile.am | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/massif/hp2ps/Makefile.am b/massif/hp2ps/Makefile.am index b8d5d8e0..6c223d71 100644 --- a/massif/hp2ps/Makefile.am +++ b/massif/hp2ps/Makefile.am @@ -1,4 +1,6 @@ + include $(top_srcdir)/Makefile.all.am +include $(top_srcdir)/Makefile.flags.am AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -g @@ -31,7 +33,13 @@ hp2ps_SOURCES = \ Scale.c \ Shade.c \ Utilities.c -hp2ps_LDADD = -lm + +# Build hp2ps for the primary target only. +hp2ps_LDADD = -lm +hp2ps_CPPFLAGS = $(AM_CPPFLAGS_PRI) +hp2ps_CFLAGS = $(AM_CFLAGS_PRI) +hp2ps_CCASFLAGS = $(AM_CCASFLAGS_PRI) +hp2ps_LDFLAGS = $(AM_CFLAGS_PRI) noinst_HEADERS = \ AreaBelow.h \ diff --git a/massif/tests/Makefile.am b/massif/tests/Makefile.am index 025acc0d..ea5ae33c 100644 --- a/massif/tests/Makefile.am +++ b/massif/tests/Makefile.am @@ -1,3 +1,7 @@ + +# For AM_FLAG_M3264_PRI +include $(top_srcdir)/Makefile.flags.am + noinst_SCRIPTS = filter_stderr EXTRA_DIST = $(noinst_SCRIPTS) \ @@ -6,7 +10,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ true_html.stderr.exp true_html.vgtest \ true_text.stderr.exp true_text.vgtest -AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g +AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI) check_PROGRAMS = \ basic_malloc |