Mercurial > hg > graal-compiler
diff make/bsd/makefiles/vm.make @ 4006:436b4a3231bf
7098194: integrate macosx-port changes
Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29.
Reviewed-by: kvn, dholmes, never, phh
Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
| author | dcubed |
|---|---|
| date | Thu, 13 Oct 2011 09:35:42 -0700 |
| parents | f08d439fab8c |
| children | ee87cfe2f8f9 94ec88ca68e2 |
line wrap: on
line diff
--- a/make/bsd/makefiles/vm.make Mon Oct 10 21:01:36 2011 -0400 +++ b/make/bsd/makefiles/vm.make Thu Oct 13 09:35:42 2011 -0700 @@ -108,6 +108,7 @@ # Don't set excutable bit on stack segment # the same could be done by separate execstack command +# Darwin is non-executable-stack by default ifneq ($(OS_VENDOR), Darwin) LFLAGS += -Xlinker -z -Xlinker noexecstack endif @@ -322,7 +323,16 @@ #---------------------------------------------------------------------- +ifeq ($(OS_VENDOR), Darwin) +$(LIBJVM).dSYM: $(LIBJVM) + dsymutil $(LIBJVM) + +# no launcher or libjvm_db for macosx +build: $(LIBJVM) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(LIBJVM).dSYM + echo "Doing vm.make build:" +else build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) +endif install: install_jvm install_jsig install_saproc