1.1 --- a/common/autoconf/spec.gmk.in Wed Oct 24 13:11:42 2012 -0700
1.2 +++ b/common/autoconf/spec.gmk.in Fri Oct 26 14:29:57 2012 -0700
1.3 @@ -41,7 +41,9 @@
1.4 #'
1.5 DQUOTE:="
1.6 #"
1.7 -define NEWLINE:=
1.8 +define NEWLINE
1.9 +
1.10 +
1.11 endef
1.12
1.13 # A self-referential reference to this file.
1.14 @@ -50,11 +52,7 @@
1.15 # Specify where the spec file is.
1.16 MAKE_ARGS="SPEC=$(SPEC)"
1.17
1.18 -# TODO The logic for finding and setting MAKE is currently not working
1.19 -# well on windows. Disable it TEMPORARILY there for now.
1.20 -ifneq (@OPENJDK_TARGET_OS@,windows)
1.21 - MAKE:=@MAKE@
1.22 -endif
1.23 +MAKE:=@MAKE@
1.24
1.25 # Pass along the verbosity setting.
1.26 ifeq (,$(findstring VERBOSE=,$(MAKE)))
1.27 @@ -77,6 +75,7 @@
1.28 # The built jdk will run in this target system.
1.29 OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
1.30 OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@
1.31 +OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@
1.32
1.33 OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
1.34 OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
1.35 @@ -109,16 +108,21 @@
1.36 REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@
1.37
1.38 @SET_OPENJDK@
1.39 -JIGSAW:=@JIGSAW@
1.40 LIBM:=-lm
1.41 LIBDL:=@LIBDL@
1.42
1.43 # colon or semicolon
1.44 PATH_SEP:=@PATH_SEP@
1.45
1.46 -# Set special env variables, to be passed to external tools.
1.47 -# Used for cygwin setups.
1.48 -@SETUPDEVENV@
1.49 +ifeq ($(OPENJDK_TARGET_OS), windows)
1.50 + # On Windows, the Visual Studio toolchain needs the LIB and INCLUDE
1.51 + # environment variables (in Windows path style), and the PATH needs to
1.52 + # be adjusted to include Visual Studio tools (but this needs to be in
1.53 + # cygwin/msys style).
1.54 + export PATH:=@VS_PATH@
1.55 + export INCLUDE:=@VS_INCLUDE@
1.56 + export LIB:=@VS_LIB@
1.57 +endif
1.58
1.59 # The sys root where standard headers and libraries are found.
1.60 # Usually not needed since the configure script should have
1.61 @@ -131,7 +135,6 @@
1.62 OVERRIDE_SRC_ROOT:=@OVERRIDE_SRC_ROOT@
1.63 TOPDIR:=@SRC_ROOT@
1.64 OUTPUT_ROOT:=@OUTPUT_ROOT@
1.65 -JDK_MAKE_SHARED_DIR:=@JDK_TOPDIR@/makefiles/common/shared
1.66 JDK_TOPDIR:=@JDK_TOPDIR@
1.67 LANGTOOLS_TOPDIR:=@LANGTOOLS_TOPDIR@
1.68 CORBA_TOPDIR:=@CORBA_TOPDIR@
1.69 @@ -155,6 +158,8 @@
1.70 PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
1.71 JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
1.72 COMPANY_NAME:=@COMPANY_NAME@
1.73 +MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
1.74 +MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
1.75
1.76 # Different version strings generated from the above information.
1.77 JDK_VERSION:=@JDK_VERSION@
1.78 @@ -289,7 +294,7 @@
1.79 CXX_FLAG_DEPS:=@CXX_FLAG_DEPS@
1.80
1.81 # Tools that potentially need to be cross compilation aware.
1.82 -CC:=@UNCYGDRIVE@ @CCACHE@ @CC@
1.83 +CC:=@FIXPATH@ @CCACHE@ @CC@
1.84
1.85 # CFLAGS used to compile the jdk native libraries (C-code)
1.86 CFLAGS_JDKLIB:=@CFLAGS_JDKLIB@
1.87 @@ -299,17 +304,17 @@
1.88 CFLAGS_JDKEXE:=@CFLAGS_JDKEXE@
1.89 CXXFLAGS_JDKEXE:=@CXXFLAGS_JDKEXE@
1.90
1.91 -CXX:=@UNCYGDRIVE@ @CCACHE@ @CXX@
1.92 +CXX:=@FIXPATH@ @CCACHE@ @CXX@
1.93 #CXXFLAGS:=@CXXFLAGS@
1.94
1.95 OBJC:=@CCACHE@ @OBJC@
1.96 #OBJCFLAGS:=@OBJCFLAGS@
1.97
1.98 -CPP:=@UNCYGDRIVE@ @CPP@
1.99 +CPP:=@FIXPATH@ @CPP@
1.100 #CPPFLAGS:=@CPPFLAGS@
1.101
1.102 # The linker can be gcc or ld on posix systems, or link.exe on windows systems.
1.103 -LD:=@UNCYGDRIVE@ @LD@
1.104 +LD:=@FIXPATH@ @LD@
1.105
1.106 # LDFLAGS used to link the jdk native libraries (C-code)
1.107 LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@
1.108 @@ -317,7 +322,7 @@
1.109
1.110 # On some platforms the linker cannot be used to create executables, thus
1.111 # the need for a separate LDEXE command.
1.112 -LDEXE:=@UNCYGDRIVE@ @LDEXE@
1.113 +LDEXE:=@FIXPATH@ @LDEXE@
1.114
1.115 # LDFLAGS used to link the jdk native launchers (C-code)
1.116 LDFLAGS_JDKEXE:=@LDFLAGS_JDKEXE@
1.117 @@ -327,22 +332,22 @@
1.118 LDFLAGS_CXX_JDK:=@LDFLAGS_CXX_JDK@
1.119
1.120 # Sometimes a different linker is needed for c++ libs
1.121 -LDCXX:=@UNCYGDRIVE@ @LDCXX@
1.122 +LDCXX:=@FIXPATH@ @LDCXX@
1.123 # The flags for linking libstdc++ linker.
1.124 LIBCXX:=@LIBCXX@
1.125
1.126 # Sometimes a different linker is needed for c++ executables
1.127 -LDEXECXX:=@UNCYGDRIVE@ @LDEXECXX@
1.128 +LDEXECXX:=@FIXPATH@ @LDEXECXX@
1.129
1.130 # BUILD_CC/BUILD_LD is a compiler/linker that generates code that is runnable on the
1.131 # build platform.
1.132 -BUILD_CC:=@UNCYGDRIVE@ @BUILD_CC@
1.133 -BUILD_LD:=@UNCYGDRIVE@ @BUILD_LD@
1.134 +BUILD_CC:=@FIXPATH@ @BUILD_CC@
1.135 +BUILD_LD:=@FIXPATH@ @BUILD_LD@
1.136
1.137 -AS:=@UNCYGDRIVE@ @AS@
1.138 +AS:=@FIXPATH@ @AS@
1.139
1.140 # AR is used to create a static library (is ar in posix, lib.exe in windows)
1.141 -AR:=@UNCYGDRIVE@ @AR@
1.142 +AR:=@FIXPATH@ @AR@
1.143 ARFLAGS:=@ARFLAGS@
1.144
1.145 NM:=@NM@
1.146 @@ -400,20 +405,20 @@
1.147
1.148 JAVA_FLAGS:=@BOOT_JDK_JVMARGS@
1.149
1.150 -JAVA=@UNCYGDRIVE@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS)
1.151 +JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS)
1.152
1.153 -JAVAC=@UNCYGDRIVE@ $(BOOT_JDK)/bin/javac
1.154 +JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac
1.155 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
1.156 # overriding that value by using ?=.
1.157 JAVAC_FLAGS?=@JAVAC_FLAGS@
1.158
1.159 -JAVAH=@UNCYGDRIVE@ $(BOOT_JDK)/bin/javah
1.160 +JAVAH=@FIXPATH@ $(BOOT_JDK)/bin/javah
1.161
1.162 -JAR=@UNCYGDRIVE@ $(BOOT_JDK)/bin/jar
1.163 +JAR=@FIXPATH@ $(BOOT_JDK)/bin/jar
1.164
1.165 -RMIC=@UNCYGDRIVE@ $(BOOT_JDK)/bin/rmic
1.166 +RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic
1.167
1.168 -NATIVE2ASCII=@UNCYGDRIVE@ $(BOOT_JDK)/bin/native2ascii
1.169 +NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii
1.170
1.171 # Base flags for RC
1.172 # Guarding this against resetting value. Legacy make files include spec multiple
1.173 @@ -424,21 +429,20 @@
1.174
1.175 # A specific java binary with specific options can be used to run
1.176 # the long running background sjavac servers and other long running tasks.
1.177 -SJAVAC_SERVER_JAVA:=@UNCYGDRIVE@ @SJAVAC_SERVER_JAVA@
1.178 +SJAVAC_SERVER_JAVA:=@FIXPATH@ @SJAVAC_SERVER_JAVA@
1.179
1.180 # Tools adhering to a minimal and common standard of posix compliance.
1.181 AWK:=@AWK@
1.182 BASENAME:=@BASENAME@
1.183 +BASH:=@BASH@
1.184 CAT:=@CAT@
1.185 CCACHE:=@CCACHE@
1.186 # CD is going away, but remains to cater for legacy makefiles.
1.187 CD:=cd
1.188 CHMOD:=@CHMOD@
1.189 CP:=@CP@
1.190 -CPIO:=@CPIO@
1.191 CUT:=@CUT@
1.192 DATE:=@DATE@
1.193 -DF:=@DF@
1.194 DIFF:=@DIFF@
1.195 FIND:=@FIND@
1.196 FIND_DELETE:=@FIND_DELETE@
1.197 @@ -461,6 +465,7 @@
1.198 TAR:=@TAR@
1.199 TAIL:=@TAIL@
1.200 TEE:=@TEE@
1.201 +TIME:=@TIME@
1.202 TR:=@TR@
1.203 TOUCH:=@TOUCH@
1.204 WC:=@WC@
1.205 @@ -468,9 +473,9 @@
1.206 ZIPEXE:=@ZIP@
1.207 ZIP:=@ZIP@
1.208 UNZIP:=@UNZIP@
1.209 -MT:=@UNCYGDRIVE@ @MT@
1.210 -RC:=@UNCYGDRIVE@ @RC@
1.211 -DUMPBIN:=@UNCYGDRIVE@ @DUMPBIN@
1.212 +MT:=@FIXPATH@ @MT@
1.213 +RC:=@FIXPATH@ @RC@
1.214 +DUMPBIN:=@FIXPATH@ @DUMPBIN@
1.215 CYGPATH:=@CYGPATH@
1.216 LDD:=@LDD@
1.217 OTOOL:=@OTOOL@
1.218 @@ -479,8 +484,9 @@
1.219 FILE:=@FILE@
1.220 HG:=@HG@
1.221 OBJCOPY:=@OBJCOPY@
1.222 +SETFILE:=@SETFILE@
1.223
1.224 -UNCYGDRIVE:=@UNCYGDRIVE@
1.225 +FIXPATH:=@FIXPATH@
1.226
1.227 # Where the build output is stored for your convenience.
1.228 BUILD_LOG:=@BUILD_LOG@
1.229 @@ -488,14 +494,12 @@
1.230 BUILD_LOG_WRAPPER:=@BUILD_LOG_WRAPPER@
1.231
1.232 # Build setup
1.233 -DISABLE_NIMBUS:=@DISABLE_NIMBUS@
1.234 ENABLE_JFR=@ENABLE_JFR@
1.235 USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
1.236 USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
1.237 USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
1.238 LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
1.239 -CHECK_FOR_VCINSTALLDIR=@CHECK_FOR_VCINSTALLDIR@
1.240 -MSVCRNN_DLL:=@MSVCR100DLL@
1.241 +MSVCR_DLL:=@MSVCR_DLL@
1.242
1.243
1.244 # ADD_SRCS takes a single argument with source roots
