# HG changeset patch # User ddehaven # Date 1426630735 25200 # Tue Mar 17 15:18:55 2015 -0700 # Node ID 456409bb975817987c03be9487ccc5d8639437c3 # Parent c82d1a19ffb5fffe5b14ad6c997c046848d7d28c 8075400: Cannot build hotspot in jdk8u on OSX 10.10 (Yosemite) Reviewed-by: diff --git a/make/bsd/makefiles/gcc.make b/make/bsd/makefiles/gcc.make --- a/make/bsd/makefiles/gcc.make +++ b/make/bsd/makefiles/gcc.make @@ -349,7 +349,7 @@ # The macro takes the version with no dots, ex: 1070 CFLAGS += -DMAC_OS_X_VERSION_MAX_ALLOWED=$(subst .,,$(MACOSX_VERSION_MIN)) \ -mmacosx-version-min=$(MACOSX_VERSION_MIN) - LDFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) + LFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) endif diff --git a/make/bsd/makefiles/saproc.make b/make/bsd/makefiles/saproc.make --- a/make/bsd/makefiles/saproc.make +++ b/make/bsd/makefiles/saproc.make @@ -110,6 +110,9 @@ ifneq ($(OS_VENDOR), Darwin) SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) +else +# bring in minimum version argument or we'll fail on OSX 10.10 +SA_LFLAGS = $(LFLAGS) endif SA_LFLAGS += $(LDFLAGS_HASH_STYLE)