1149 $2LDFLAGS_JDK="[$]$2LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1150 $2JVM_CFLAGS="[$]$2JVM_CFLAGS \
1151 -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
1152 -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1153
1154 if test -n "$MACOSX_VERSION_MAX"; then
1155 $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
1156 -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
1157 $2JVM_CFLAGS="[$]$2JVM_CFLAGS \
1158 -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
1159 fi
1160 fi
1161
1162 # Setup some hard coded includes
1163 $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
1164 -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
1165 -I${TOPDIR}/src/java.base/share/native/include \
1166 -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS/native/include \
1167 -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/include \
1168 -I${TOPDIR}/src/java.base/share/native/libjava \
1169 -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/libjava"
1170
1171 # The shared libraries are compiled using the picflag.
1172 $2CFLAGS_JDKLIB="[$]$2COMMON_CCXXFLAGS_JDK \
1173 [$]$2CFLAGS_JDK [$]$2EXTRA_CFLAGS_JDK $PICFLAG [$]$2CFLAGS_JDKLIB_EXTRA"
1174 $2CXXFLAGS_JDKLIB="[$]$2COMMON_CCXXFLAGS_JDK \
1175 [$]$2CXXFLAGS_JDK [$]$2EXTRA_CXXFLAGS_JDK $PICFLAG [$]$2CXXFLAGS_JDKLIB_EXTRA"
1176
1177 # Executable flags
1178 $2CFLAGS_JDKEXE="[$]$2COMMON_CCXXFLAGS_JDK [$]$2CFLAGS_JDK [$]$2EXTRA_CFLAGS_JDK"
1179 $2CXXFLAGS_JDKEXE="[$]$2COMMON_CCXXFLAGS_JDK [$]$2CXXFLAGS_JDK [$]$2EXTRA_CXXFLAGS_JDK"
1180
1181 AC_SUBST($2CFLAGS_JDKLIB)
1182 AC_SUBST($2CFLAGS_JDKEXE)
1183 AC_SUBST($2CXXFLAGS_JDKLIB)
1184 AC_SUBST($2CXXFLAGS_JDKEXE)
1185
1186 # Setup LDFLAGS et al.
1187 #
1188
1189 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
|
1149 $2LDFLAGS_JDK="[$]$2LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1150 $2JVM_CFLAGS="[$]$2JVM_CFLAGS \
1151 -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
1152 -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1153
1154 if test -n "$MACOSX_VERSION_MAX"; then
1155 $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
1156 -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
1157 $2JVM_CFLAGS="[$]$2JVM_CFLAGS \
1158 -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
1159 fi
1160 fi
1161
1162 # Setup some hard coded includes
1163 $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
1164 -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
1165 -I${TOPDIR}/src/java.base/share/native/include \
1166 -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS/native/include \
1167 -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/include \
1168 -I${TOPDIR}/src/java.base/share/native/libjava \
1169 -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/libjava \
1170 -I${TOPDIR}/src/hotspot/share/include \
1171 -I${TOPDIR}/src/hotspot/os/${HOTSPOT_$1_OS_TYPE}/include"
1172
1173 # The shared libraries are compiled using the picflag.
1174 $2CFLAGS_JDKLIB="[$]$2COMMON_CCXXFLAGS_JDK \
1175 [$]$2CFLAGS_JDK [$]$2EXTRA_CFLAGS_JDK $PICFLAG [$]$2CFLAGS_JDKLIB_EXTRA"
1176 $2CXXFLAGS_JDKLIB="[$]$2COMMON_CCXXFLAGS_JDK \
1177 [$]$2CXXFLAGS_JDK [$]$2EXTRA_CXXFLAGS_JDK $PICFLAG [$]$2CXXFLAGS_JDKLIB_EXTRA"
1178
1179 # Executable flags
1180 $2CFLAGS_JDKEXE="[$]$2COMMON_CCXXFLAGS_JDK [$]$2CFLAGS_JDK [$]$2EXTRA_CFLAGS_JDK"
1181 $2CXXFLAGS_JDKEXE="[$]$2COMMON_CCXXFLAGS_JDK [$]$2CXXFLAGS_JDK [$]$2EXTRA_CXXFLAGS_JDK"
1182
1183 AC_SUBST($2CFLAGS_JDKLIB)
1184 AC_SUBST($2CFLAGS_JDKEXE)
1185 AC_SUBST($2CXXFLAGS_JDKLIB)
1186 AC_SUBST($2CXXFLAGS_JDKEXE)
1187
1188 # Setup LDFLAGS et al.
1189 #
1190
1191 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
|