Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 6596:dfb40f066c6c jdk8-b80
Merge
author | katleman |
---|---|
date | Thu, 28 Feb 2013 20:30:34 -0800 |
parents | d967dd39a5ca (current diff) b760d5d4b8d3 (diff) |
children | d60a95b95f01 aee1c6c52b68 f960a34f05ce |
files | |
diffstat | 4 files changed, 18 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Defs-macosx.gmk Thu Feb 28 10:42:40 2013 -0800 +++ b/make/common/Defs-macosx.gmk Thu Feb 28 20:30:34 2013 -0800 @@ -406,10 +406,16 @@ LIB_LOCATION ?= $(LIBDIR) -# Adding these macros will make it an error to link to mac APIs newer than OS version 10.7 -ifeq ($(MACOSX_REQUIRED_VERSION),) - MACOSX_REQUIRED_VERSION:=1070 +# Setting these parameters makes it an error to link to macosx APIs that are +# newer than the given OS version and makes the linked binaries compatible even +# if built on a newer version of the OS. +# The expected format is X.Y.Z +ifeq ($(MACOSX_VERSION_MIN),) + MACOSX_VERSION_MIN=10.7.0 endif -MACOSX_OS_VERSION_CFLAGS := -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MACOSX_REQUIRED_VERSION) +# The macro takes the version with no dots, ex: 1070 +MACOSX_OS_VERSION_CFLAGS := -DMAC_OS_X_VERSION_MAX_ALLOWED=$(subst .,,$(MACOSX_VERSION_MIN)) \ + -mmacosx-version-min=$(MACOSX_VERSION_MIN) OTHER_CFLAGS += $(MACOSX_OS_VERSION_CFLAGS) OTHER_CXXFLAGS += $(MACOSX_OS_VERSION_CFLAGS) +OTHER_LDFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN)
--- a/make/common/shared/Compiler-msvc.gmk Thu Feb 28 10:42:40 2013 -0800 +++ b/make/common/shared/Compiler-msvc.gmk Thu Feb 28 20:30:34 2013 -0800 @@ -28,6 +28,7 @@ # ifeq ($(PLATFORM), windows) +ifndef CONFIGURE_BUILD CC = $(COMPILER_PATH)cl CPP = $(COMPILER_PATH)cl CXX = $(COMPILER_PATH)cl @@ -36,7 +37,7 @@ LINK = $(COMPILER_PATH)link LINK32 = $(LINK) DUMPBIN = $(COMPILER_PATH)dumpbin.exe - + # Fill in unknown values COMPILER_NAME=Unknown MSVC Compiler COMPILER_VERSION= @@ -87,6 +88,6 @@ SHARED_LIBRARY_FLAG = -LD # RSC is always same as RC (Not sure who uses this RSC variable) RSC = $(RC) - +endif endif
--- a/make/common/shared/Defs-utils.gmk Thu Feb 28 10:42:40 2013 -0800 +++ b/make/common/shared/Defs-utils.gmk Thu Feb 28 20:30:34 2013 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2013, 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 @@ -82,7 +82,9 @@ MCS = $(COMPILER_PATH)mcs NM = $(COMPILER_PATH)nm STRIP = $(COMPILER_PATH)strip -else +endif + +ifeq ($(PLATFORM),solaris) AR = $(UTILS_CCS_BIN_PATH)ar AS = $(UTILS_CCS_BIN_PATH)as LD = $(UTILS_CCS_BIN_PATH)ld
--- a/makefiles/Images.gmk Thu Feb 28 10:42:40 2013 -0800 +++ b/makefiles/Images.gmk Thu Feb 28 20:30:34 2013 -0800 @@ -59,7 +59,7 @@ $(ECHO) $(LOG_INFO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(MKDIR) -p $(@D) $(RM) $@ - $(SED) 's/$$//g' $< > $@ + LC_ALL=C $(SED) 's/$$//g' $< > $@ $(CHMOD) 444 $@ endef