common/autoconf/spec.gmk.in

*** 80,90 ****
  # The "human readable" name of this configuration
  CONF_NAME:=@CONF_NAME@
  
  # The built jdk will run in this target system.
  OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
! OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@
  OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@
  
  OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
  OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
  OPENJDK_TARGET_CPU_BITS:=@OPENJDK_TARGET_CPU_BITS@
--- 80,90 ----
  # The "human readable" name of this configuration
  CONF_NAME:=@CONF_NAME@
  
  # The built jdk will run in this target system.
  OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
! OPENJDK_TARGET_OS_TYPE:=@OPENJDK_TARGET_OS_TYPE@
  OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@
  
  OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
  OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
  OPENJDK_TARGET_CPU_BITS:=@OPENJDK_TARGET_CPU_BITS@
*** 97,113 ****
  OPENJDK_TARGET_CPU_LIBDIR:=@OPENJDK_TARGET_CPU_LIBDIR@
  OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
  OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
  OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
  OPENJDK_TARGET_CPU_JLI_CFLAGS:=@OPENJDK_TARGET_CPU_JLI_CFLAGS@
- OPENJDK_TARGET_OS_API_DIR:=@OPENJDK_TARGET_OS_API_DIR@
  OPENJDK_TARGET_OS_EXPORT_DIR:=@OPENJDK_TARGET_OS_EXPORT_DIR@
  
  # We are building on this build system.
  # When not cross-compiling, it is the same as the target.
  OPENJDK_BUILD_OS:=@OPENJDK_BUILD_OS@
! OPENJDK_BUILD_OS_API:=@OPENJDK_BUILD_OS_API@
  OPENJDK_BUILD_OS_ENV:=@OPENJDK_BUILD_OS_ENV@
  
  OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
  OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
  OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
--- 97,112 ----
  OPENJDK_TARGET_CPU_LIBDIR:=@OPENJDK_TARGET_CPU_LIBDIR@
  OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
  OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
  OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
  OPENJDK_TARGET_CPU_JLI_CFLAGS:=@OPENJDK_TARGET_CPU_JLI_CFLAGS@
  OPENJDK_TARGET_OS_EXPORT_DIR:=@OPENJDK_TARGET_OS_EXPORT_DIR@
  
  # We are building on this build system.
  # When not cross-compiling, it is the same as the target.
  OPENJDK_BUILD_OS:=@OPENJDK_BUILD_OS@
! OPENJDK_BUILD_OS_TYPE:=@OPENJDK_BUILD_OS_TYPE@
  OPENJDK_BUILD_OS_ENV:=@OPENJDK_BUILD_OS_ENV@
  
  OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
  OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
  OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
*** 348,358 ****
  #OBJCFLAGS:=@OBJCFLAGS@
  
  CPP:=@FIXPATH@ @CPP@
  #CPPFLAGS:=@CPPFLAGS@
  
! # The linker can be gcc or ld on posix systems, or link.exe on windows systems.
  LD:=@FIXPATH@ @LD@
  
  # Xcode SDK path
  SDKROOT:=@SDKROOT@
  
--- 347,357 ----
  #OBJCFLAGS:=@OBJCFLAGS@
  
  CPP:=@FIXPATH@ @CPP@
  #CPPFLAGS:=@CPPFLAGS@
  
! # The linker can be gcc or ld on unix systems, or link.exe on windows systems.
  LD:=@FIXPATH@ @LD@
  
  # Xcode SDK path
  SDKROOT:=@SDKROOT@
  
*** 389,399 ****
  BUILD_CC:=@FIXPATH@ @BUILD_CC@
  BUILD_LD:=@FIXPATH@ @BUILD_LD@
  
  AS:=@FIXPATH@ @AS@
  
! # AR is used to create a static library (is ar in posix, lib.exe in windows)
  AR:=@FIXPATH@ @AR@
  ARFLAGS:=@ARFLAGS@
  
  NM:=@NM@
  GNM:=@GNM@
--- 388,398 ----
  BUILD_CC:=@FIXPATH@ @BUILD_CC@
  BUILD_LD:=@FIXPATH@ @BUILD_LD@
  
  AS:=@FIXPATH@ @AS@
  
! # AR is used to create a static library (is ar in unix, lib.exe in windows)
  AR:=@FIXPATH@ @AR@
  ARFLAGS:=@ARFLAGS@
  
  NM:=@NM@
  GNM:=@GNM@
*** 558,571 ****
  FIXPATH:=@FIXPATH@
  
  # Where the build output is stored for your convenience.
  BUILD_LOG:=@BUILD_LOG@
  BUILD_LOG_PREVIOUS:=@BUILD_LOG_PREVIOUS@
! # Disable the build log wrapper on sjavac+winapi until
  # we have solved how to prevent the log wrapper to wait
  # for the background sjavac server process.
! ifeq (@ENABLE_SJAVAC@X@OPENJDK_BUILD_OS_API@,yesXwinapi)
    BUILD_LOG_WRAPPER:=
  else
    BUILD_LOG_WRAPPER:=@BUILD_LOG_WRAPPER@
  endif
  
--- 557,570 ----
  FIXPATH:=@FIXPATH@
  
  # Where the build output is stored for your convenience.
  BUILD_LOG:=@BUILD_LOG@
  BUILD_LOG_PREVIOUS:=@BUILD_LOG_PREVIOUS@
! # Disable the build log wrapper on sjavac+windows until
  # we have solved how to prevent the log wrapper to wait
  # for the background sjavac server process.
! ifeq (@ENABLE_SJAVAC@X@OPENJDK_BUILD_OS@,yesXwindows)
    BUILD_LOG_WRAPPER:=
  else
    BUILD_LOG_WRAPPER:=@BUILD_LOG_WRAPPER@
  endif