diff options
| author | dholmes <none@none> | 2013-02-18 15:35:05 -0500 |
|---|---|---|
| committer | dholmes <none@none> | 2013-02-18 15:35:05 -0500 |
| commit | a8e312614dcee3647e8a96506dfe66e283f82ece (patch) | |
| tree | 28e8bbc350217b4e2f10e161086f059b1e571891 | |
| parent | 5cf99dcf962e7832c0fb7f634c8196000b84d75f (diff) | |
| parent | a46ae0fe9d820e0219795647b088f61a95bdfa00 (diff) | |
Mergejdk8-b78
| -rw-r--r-- | common/autoconf/generated-configure.sh | 7 | ||||
| -rw-r--r-- | common/autoconf/spec.gmk.in | 3 | ||||
| -rw-r--r-- | common/autoconf/toolchain.m4 | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 452ab14..741160e 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -649,6 +649,7 @@ CXXFLAGS_JDKEXE CXXFLAGS_JDKLIB CFLAGS_JDKEXE CFLAGS_JDKLIB +MACOSX_REQUIRED_VERSION PACKAGE_PATH LEGACY_EXTRA_LDFLAGS LEGACY_EXTRA_CXXFLAGS @@ -3731,7 +3732,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1361137039 +DATE_WHEN_GENERATED=1361218904 ############################################################################### # @@ -28241,6 +28242,10 @@ if test "x$OPENJDK_TARGET_OS" = xsolaris; then fi if test "x$OPENJDK_TARGET_OS" = xmacosx; then CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE" + # Adding these macros will make it an error to link to mac APIs newer than OS version 10.7 + MACOSX_REQUIRED_VERSION=1070 + + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)" fi if test "x$OPENJDK_TARGET_OS" = xbsd; then CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index ad88295..ec47d03 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -282,6 +282,9 @@ X_CFLAGS:=@X_CFLAGS@ X_LIBS:=@X_LIBS@ OPENWIN_HOME:=@OPENWIN_HOME@ +# The lowest required version of macosx to enforce compatiblity for +MACOSX_REQUIRED_VERSION=@MACOSX_REQUIRED_VERSION@ + # There are two types: CC or CL # CC is gcc and others behaving reasonably similar. # CL is cl.exe only. diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 index 7b7f19f..740b0c4 100644 --- a/common/autoconf/toolchain.m4 +++ b/common/autoconf/toolchain.m4 @@ -876,6 +876,10 @@ if test "x$OPENJDK_TARGET_OS" = xsolaris; then fi if test "x$OPENJDK_TARGET_OS" = xmacosx; then CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE" + # Adding these macros will make it an error to link to mac APIs newer than OS version 10.7 + MACOSX_REQUIRED_VERSION=1070 + AC_SUBST(MACOSX_REQUIRED_VERSION) + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)" fi if test "x$OPENJDK_TARGET_OS" = xbsd; then CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" |