Mercurial > hg > truffle
diff make/solaris/Makefile @ 1930:2d26b0046e0d
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Tue, 30 Nov 2010 14:53:30 +0100 |
parents | 34bd82eba3bb |
children | d6cdc6c77582 |
line wrap: on
line diff
--- a/make/solaris/Makefile Mon Nov 29 18:32:30 2010 +0100 +++ b/make/solaris/Makefile Tue Nov 30 14:53:30 2010 +0100 @@ -1,5 +1,5 @@ # -# Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -16,10 +16,10 @@ # 2 along with this work; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. # -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. -# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# # # This makefile creates a build tree and lights off a build. @@ -36,13 +36,13 @@ # or BOOTDIR has to be set. We do *not* search javac, javah, rmic etc. # from the PATH. -# Along with VM, Serviceability Agent (SA) is built for SA/JDI binding. -# JDI binding on SA produces two binaries: +# Along with VM, Serviceability Agent (SA) is built for SA/JDI binding. +# JDI binding on SA produces two binaries: # 1. sa-jdi.jar - This is build before building libjvm[_g].so # Please refer to ./makefiles/sa.make # 2. libsaproc[_g].so - Native library for SA - This is built after # libjsig[_g].so (signal interposition library) -# Please refer to ./makefiles/vm.make +# Please refer to ./makefiles/vm.make # If $(GAMMADIR)/agent dir is not present, SA components are not built. ifeq ($(GAMMADIR),) @@ -52,10 +52,10 @@ endif include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make -ifndef LP64 ifndef CC_INTERP -FORCE_TIERED=1 -endif + ifndef FORCE_TIERED + FORCE_TIERED=1 + endif endif ifdef LP64 @@ -212,7 +212,7 @@ $(BUILDTREE) VARIANT=tiered $(SUBDIRS_C2): $(BUILDTREE_MAKE) -ifdef FORCE_TIERED +ifeq ($(FORCE_TIERED),1) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks $(BUILDTREE) VARIANT=tiered FORCE_TIERED=1 else