common/autoconf/toolchain.m4
changeset 18426 bf9e616c1476
parent 18423 5f706ddb73ed
child 19311 741980fe0b33
child 22461 6ed8434664ed
equal deleted inserted replaced
18425:768f15fff30a 18426:bf9e616c1476
   367 
   367 
   368     RC_FLAGS="-nologo -l 0x409 -r"
   368     RC_FLAGS="-nologo -l 0x409 -r"
   369     AS_IF([test "x$VARIANT" = xOPT], [
   369     AS_IF([test "x$VARIANT" = xOPT], [
   370         RC_FLAGS="$RC_FLAGS -d NDEBUG"
   370         RC_FLAGS="$RC_FLAGS -d NDEBUG"
   371     ])
   371     ])
   372     JDK_UPDATE_VERSION_NOTNULL=$JDK_UPDATE_VERSION
   372 
   373     AS_IF([test "x$JDK_UPDATE_VERSION" = x], [
   373     # The version variables used to create RC_FLAGS may be overridden
   374         JDK_UPDATE_VERSION_NOTNULL=0
   374     # in a custom configure script, or possibly the command line.  
   375     ])
   375     # Let those variables be expanded at make time in spec.gmk.
   376     RC_FLAGS="$RC_FLAGS -d \"JDK_BUILD_ID=$FULL_VERSION\""
   376     # The \$ are escaped to the shell, and the $(...) variables
   377     RC_FLAGS="$RC_FLAGS -d \"JDK_COMPANY=$COMPANY_NAME\""
   377     # are evaluated by make.
   378     RC_FLAGS="$RC_FLAGS -d \"JDK_COMPONENT=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME binary\""
   378     RC_FLAGS="$RC_FLAGS \
   379     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)\" \
   380     RC_FLAGS="$RC_FLAGS -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\""
   380         -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
   381     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\" \
   382     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)\""
   383 
   386 
   384     # lib.exe is used to create static libraries.
   387     # lib.exe is used to create static libraries.
   385     AC_CHECK_PROG([WINAR], [lib],[lib],,,)
   388     AC_CHECK_PROG([WINAR], [lib],[lib],,,)
   386     BASIC_FIXUP_EXECUTABLE(WINAR)
   389     BASIC_FIXUP_EXECUTABLE(WINAR)
   387     AR="$WINAR"
   390     AR="$WINAR"