Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/toolchain.m4
common/autoconf/toolchain.m4
- changeset 966
- 81632308f60d
- parent 965
- 3ef3f4174c2b
- parent 755
- dd3b314f4471
- child 970
- e885c762cedd
equal
deleted
inserted
replaced
| 965:3ef3f4174c2b | 966:81632308f60d |
|---|---|
| 45 COMPILER_VENDOR="Sun Studio" | 45 COMPILER_VENDOR="Sun Studio" |
| 46 fi | 46 fi |
| 47 elif test "x$OPENJDK_TARGET_OS" = xwindows; then | 47 elif test "x$OPENJDK_TARGET_OS" = xwindows; then |
| 48 # First line typically looks something like: | 48 # First line typically looks something like: |
| 49 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 | 49 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 |
| 50 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1` | 50 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'` |
| 51 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \(@<:@1-9@:>@@<:@0-9.@:>@*\) .*/\1/p"` | 51 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \(@<:@1-9@:>@@<:@0-9.@:>@*\) .*/\1/p"` |
| 52 COMPILER_VENDOR="Microsoft CL.EXE" | 52 COMPILER_VENDOR="Microsoft CL.EXE" |
| 53 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"` | 53 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"` |
| 54 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then | 54 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then |
| 55 if test "x$COMPILER_CPU_TEST" != "x80x86"; then | 55 if test "x$COMPILER_CPU_TEST" != "x80x86"; then |
| 223 if test "x$x_libraries" = "xNONE"; then | 223 if test "x$x_libraries" = "xNONE"; then |
| 224 x_libraries="$SYS_ROOT/usr/lib" | 224 x_libraries="$SYS_ROOT/usr/lib" |
| 225 fi | 225 fi |
| 226 ], | 226 ], |
| 227 []) | 227 []) |
| 228 | |
| 229 if test "x$SYS_ROOT" != "x/" ; then | |
| 230 CFLAGS="--sysroot=$SYS_ROOT $CFLAGS" | |
| 231 CXXFLAGS="--sysroot=$SYS_ROOT $CXXFLAGS" | |
| 232 OBJCFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS" | |
| 233 OBJCXXFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS" | |
| 234 CPPFLAGS="--sysroot=$SYS_ROOT $CPPFLAGS" | |
| 235 LDFLAGS="--sysroot=$SYS_ROOT $LDFLAGS" | |
| 236 fi | |
| 237 | 228 |
| 238 # Store the CFLAGS etal passed to the configure script. | 229 # Store the CFLAGS etal passed to the configure script. |
| 239 ORG_CFLAGS="$CFLAGS" | 230 ORG_CFLAGS="$CFLAGS" |
| 240 ORG_CXXFLAGS="$CXXFLAGS" | 231 ORG_CXXFLAGS="$CXXFLAGS" |
| 241 ORG_OBJCFLAGS="$OBJCFLAGS" | 232 ORG_OBJCFLAGS="$OBJCFLAGS" |
| 376 | 367 |
| 377 RC_FLAGS="-nologo -l 0x409 -r" | 368 RC_FLAGS="-nologo -l 0x409 -r" |
| 378 AS_IF([test "x$VARIANT" = xOPT], [ | 369 AS_IF([test "x$VARIANT" = xOPT], [ |
| 379 RC_FLAGS="$RC_FLAGS -d NDEBUG" | 370 RC_FLAGS="$RC_FLAGS -d NDEBUG" |
| 380 ]) | 371 ]) |
| 381 JDK_UPDATE_VERSION_NOTNULL=$JDK_UPDATE_VERSION | 372 |
| 382 AS_IF([test "x$JDK_UPDATE_VERSION" = x], [ | 373 # The version variables used to create RC_FLAGS may be overridden |
| 383 JDK_UPDATE_VERSION_NOTNULL=0 | 374 # in a custom configure script, or possibly the command line. |
| 384 ]) | 375 # Let those variables be expanded at make time in spec.gmk. |
| 385 RC_FLAGS="$RC_FLAGS -d \"JDK_BUILD_ID=$FULL_VERSION\"" | 376 # The \$ are escaped to the shell, and the $(...) variables |
| 386 RC_FLAGS="$RC_FLAGS -d \"JDK_COMPANY=$COMPANY_NAME\"" | 377 # are evaluated by make. |
| 387 RC_FLAGS="$RC_FLAGS -d \"JDK_COMPONENT=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME binary\"" | 378 RC_FLAGS="$RC_FLAGS \ |
| 388 RC_FLAGS="$RC_FLAGS -d \"JDK_VER=$JDK_MINOR_VERSION.$JDK_MICRO_VERSION.$JDK_UPDATE_VERSION_NOTNULL.$COOKED_BUILD_NUMBER\"" | 379 -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \ |
| 389 RC_FLAGS="$RC_FLAGS -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\"" | 380 -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \ |
| 390 RC_FLAGS="$RC_FLAGS -d \"JDK_NAME=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME $JDK_MINOR_VERSION $JDK_UPDATE_META_TAG\"" | 381 -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \ |
| 391 RC_FLAGS="$RC_FLAGS -d \"JDK_FVER=$JDK_MINOR_VERSION,$JDK_MICRO_VERSION,$JDK_UPDATE_VERSION_NOTNULL,$COOKED_BUILD_NUMBER\"" | 382 -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \ |
| 383 -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ | |
| 384 -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \ | |
| 385 -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\"" | |
| 392 | 386 |
| 393 # lib.exe is used to create static libraries. | 387 # lib.exe is used to create static libraries. |
| 394 AC_CHECK_PROG([WINAR], [lib],[lib],,,) | 388 AC_CHECK_PROG([WINAR], [lib],[lib],,,) |
| 395 BASIC_FIXUP_EXECUTABLE(WINAR) | 389 BASIC_FIXUP_EXECUTABLE(WINAR) |
| 396 AR="$WINAR" | 390 AR="$WINAR" |
