Mercurial > hg > truffle
comparison make/solaris/makefiles/saproc.make @ 2044:06f017f7daa7
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Fri, 07 Jan 2011 18:18:08 +0100 |
parents | 0a8e0d4345b3 |
children | 405c634f4aaa |
comparison
equal
deleted
inserted
replaced
1942:00bc9eaf0e24 | 2044:06f017f7daa7 |
---|---|
1 # | 1 # |
2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | 4 # |
5 # This code is free software; you can redistribute it and/or modify it | 5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as | 6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. |
42 | 42 |
43 DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC) | 43 DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC) |
44 | 44 |
45 # if $(AGENT_DIR) does not exist, we don't build SA | 45 # if $(AGENT_DIR) does not exist, we don't build SA |
46 | 46 |
47 checkAndBuildSA: | 47 ifneq ($(wildcard $(AGENT_DIR)),) |
48 $(QUIETLY) if [ -d $(AGENT_DIR) ] ; then \ | 48 BUILDLIBSAPROC = $(LIBSAPROC) |
49 $(MAKE) -f vm.make $(LIBSAPROC); \ | 49 endif |
50 fi | |
51 | 50 |
52 SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) | 51 SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) |
53 | 52 |
54 ifdef USE_GCC | 53 ifdef USE_GCC |
55 SA_LFLAGS += -D_REENTRANT | 54 SA_LFLAGS += -D_REENTRANT |
73 $(SA_LFLAGS) \ | 72 $(SA_LFLAGS) \ |
74 -o $@ \ | 73 -o $@ \ |
75 -ldl -ldemangle -lthread -lc | 74 -ldl -ldemangle -lthread -lc |
76 [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } | 75 [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } |
77 | 76 |
78 install_saproc: checkAndBuildSA | 77 install_saproc: $(BULDLIBSAPROC) |
79 $(QUIETLY) if [ -f $(LIBSAPROC) ] ; then \ | 78 $(QUIETLY) if [ -f $(LIBSAPROC) ] ; then \ |
80 echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)"; \ | 79 echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)"; \ |
81 cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \ | 80 cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \ |
82 fi | 81 fi |
83 | 82 |
84 .PHONY: checkAndBuildSA install_saproc | 83 .PHONY: install_saproc |