Mercurial > hg > truffle

comparison make/linux/makefiles/sa.make @ 1696:688a538aa654

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Fri, 13 Aug 2010 10:55:42 -0700
parents 126ea7725993
children ea175c1b79ce
comparison
equal deleted inserted replaced
1673:6709c14587c2 1696:688a538aa654
53 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" 53 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)"
54 54
55 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties 55 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
56 56
57 # if $(AGENT_DIR) does not exist, we don't build SA 57 # if $(AGENT_DIR) does not exist, we don't build SA
58 # also, we don't build SA on Itanium or zero. 58 # also, we don't build SA on Itanium, PowerPC, ARM or zero.
59 59
60 all: 60 all:
61 if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \ 61 if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
62 -a "$(SRCARCH)" != "arm" \
63 -a "$(SRCARCH)" != "ppc" \
64 -a "$(SRCARCH)" != "zero" ] ; then \
62 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ 65 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
63 fi 66 fi
64 67
65 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) 68 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
66 $(QUIETLY) echo "Making $@" 69 $(QUIETLY) echo "Making $@"