Mercurial > hg > arm32-8

changeset 7203:10c237e58446

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8075400: Cannot build hotspot in jdk8u on OSX 10.10 (Yosemite) Reviewed-by: dholmes, erikj
author ddehaven
date Wed, 18 Mar 2015 18:12:01 -0700
parents fdde6a70ea85
children aefa2e84b424
files make/bsd/makefiles/gcc.make make/bsd/makefiles/saproc.make
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/bsd/makefiles/gcc.make	Tue Mar 17 17:11:14 2015 -0700
+++ b/make/bsd/makefiles/gcc.make	Wed Mar 18 18:12:01 2015 -0700
@@ -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
 
 
--- a/make/bsd/makefiles/saproc.make	Tue Mar 17 17:11:14 2015 -0700
+++ b/make/bsd/makefiles/saproc.make	Wed Mar 18 18:12:01 2015 -0700
@@ -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)