equal
deleted
inserted
replaced
1111 -Wsign-compare -Wundef -Wunused-function -Wformat=2" |
1111 -Wsign-compare -Wundef -Wunused-function -Wformat=2" |
1112 fi |
1112 fi |
1113 |
1113 |
1114 # Additional macosx handling |
1114 # Additional macosx handling |
1115 if test "x$OPENJDK_$1_OS" = xmacosx; then |
1115 if test "x$OPENJDK_$1_OS" = xmacosx; then |
1116 # MACOSX_VERSION_MIN is the c++ and ld is -mmacosx-version-min argument. The expected |
1116 # MACOSX_VERSION_MIN specifies the lowest version of Macosx that the built |
1117 # format is X.Y.Z. It's hard-coded to the minimum OSX version on which the |
1117 # binaries should be compatible with, even if compiled on a newer version |
1118 # JDK can be built and makes the linked binaries compatible even if built on |
1118 # of the OS. It currently has a hard coded value. Setting this also limits |
1119 # a newer version of the OS. |
1119 # exposure to API changes in header files. Bumping this is likely to |
|
1120 # require code changes to build. |
1120 MACOSX_VERSION_MIN=10.7.0 |
1121 MACOSX_VERSION_MIN=10.7.0 |
1121 AC_SUBST(MACOSX_VERSION_MIN) |
1122 AC_SUBST(MACOSX_VERSION_MIN) |
1122 |
1123 |
1123 # Setting --with-macosx-version-max=<version> makes it an error to build or |
1124 # Setting --with-macosx-version-max=<version> makes it an error to build or |
1124 # link to macosx APIs that are newer than the given OS version. The expected |
1125 # link to macosx APIs that are newer than the given OS version. The expected |
1148 -mmacosx-version-min=\$(MACOSX_VERSION_MIN)" |
1149 -mmacosx-version-min=\$(MACOSX_VERSION_MIN)" |
1149 $2LDFLAGS_JDK="[$]$2LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)" |
1150 $2LDFLAGS_JDK="[$]$2LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)" |
1150 $2JVM_CFLAGS="[$]$2JVM_CFLAGS \ |
1151 $2JVM_CFLAGS="[$]$2JVM_CFLAGS \ |
1151 -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \ |
1152 -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \ |
1152 -mmacosx-version-min=\$(MACOSX_VERSION_MIN)" |
1153 -mmacosx-version-min=\$(MACOSX_VERSION_MIN)" |
|
1154 $2ARFLAGS="$2$ARFLAGS -mmacosx-version-min=\$(MACOSX_VERSION_MIN)" |
1153 |
1155 |
1154 if test -n "$MACOSX_VERSION_MAX"; then |
1156 if test -n "$MACOSX_VERSION_MAX"; then |
1155 $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \ |
1157 $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \ |
1156 -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))" |
1158 -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))" |
1157 $2JVM_CFLAGS="[$]$2JVM_CFLAGS \ |
1159 $2JVM_CFLAGS="[$]$2JVM_CFLAGS \ |