Mercurial > jdk8-mips64-public / file revision
common/autoconf/toolchain_windows.m4@01cc48ed67f3
common/autoconf/toolchain_windows.m4
Wed, 16 May 2018 15:52:51 -0700
- author
- kevinw
- date
- Wed, 16 May 2018 15:52:51 -0700
- changeset 2223
- 01cc48ed67f3
- parent 2220
- 47fda751abb6
- child 2224
- 20daa32eec6f
- permissions
- -rw-r--r--
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
Reviewed-by: erikj, ihse, ddehaven, billyh
1 #
2 # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 #
5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. Oracle designates this
8 # particular file as subject to the "Classpath" exception as provided
9 # by Oracle in the LICENSE file that accompanied this code.
10 #
11 # This code is distributed in the hope that it will be useful, but WITHOUT
12 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14 # version 2 for more details (a copy is included in the LICENSE file that
15 # accompanied this code).
16 #
17 # You should have received a copy of the GNU General Public License version
18 # 2 along with this work; if not, write to the Free Software Foundation,
19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20 #
21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22 # or visit www.oracle.com if you need additional information or have any
23 # questions.
24 #
26 ################################################################################
28 VALID_VS_VERSIONS="2010 2012 2013"
30 VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
31 VS_VERSION_INTERNAL_2010=100
32 VS_MSVCR_2010=msvcr100.dll
33 # We don't use msvcp on Visual Studio 2010
34 #VS_MSVCP_2010=msvcp100.dll
35 VS_ENVVAR_2010="VS100COMNTOOLS"
36 VS_VS_INSTALLDIR_2010="Microsoft Visual Studio 10.0"
37 VS_SDK_INSTALLDIR_2010="Microsoft SDKs/Windows/v7.1"
38 VS_VS_PLATFORM_NAME_2010="v100"
39 VS_SDK_PLATFORM_NAME_2010="Windows7.1SDK"
41 VS_DESCRIPTION_2012="Microsoft Visual Studio 2012"
42 VS_VERSION_INTERNAL_2012=110
43 VS_MSVCR_2012=msvcr110.dll
44 VS_MSVCP_2012=msvcp110.dll
45 VS_ENVVAR_2012="VS110COMNTOOLS"
46 VS_VS_INSTALLDIR_2012="Microsoft Visual Studio 11.0"
47 VS_SDK_INSTALLDIR_2012=
48 VS_VS_PLATFORM_NAME_2012="v110"
49 VS_SDK_PLATFORM_NAME_2012=
51 VS_DESCRIPTION_2013="Microsoft Visual Studio 2013"
52 VS_VERSION_INTERNAL_2013=120
53 VS_MSVCR_2013=msvcr120.dll
54 VS_MSVCP_2013=msvcp120.dll
55 VS_ENVVAR_2013="VS120COMNTOOLS"
56 VS_VS_INSTALLDIR_2013="Microsoft Visual Studio 12.0"
57 VS_SDK_INSTALLDIR_2013=
58 VS_VS_PLATFORM_NAME_2013="v120"
59 VS_SDK_PLATFORM_NAME_2013=
61 ################################################################################
63 AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
64 [
65 if test "x$VS_ENV_CMD" = x; then
66 VS_VERSION="$1"
67 VS_BASE="$2"
68 METHOD="$3"
70 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
71 VCVARSFILE="vc/bin/vcvars32.bat"
72 else
73 VCVARSFILE="vc/bin/amd64/vcvars64.bat"
74 fi
76 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS_BASE)
77 if test -d "$VS_BASE"; then
78 if test -f "$VS_BASE/$VCVARSFILE"; then
79 AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
80 VS_ENV_CMD="$VS_BASE/$VCVARSFILE"
81 # PLATFORM_TOOLSET is used during the compilation of the freetype sources (see
82 # 'LIB_BUILD_FREETYPE' in libraries.m4) and must be one of 'v100', 'v110' or 'v120' for VS 2010, 2012 or VS2013
83 eval PLATFORM_TOOLSET="\${VS_VS_PLATFORM_NAME_${VS_VERSION}}"
84 else
85 AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
86 AC_MSG_NOTICE([Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring])
87 fi
88 fi
89 fi
90 ])
92 ################################################################################
94 AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT],
95 [
96 if test "x$VS_ENV_CMD" = x; then
97 VS_VERSION="$1"
98 WIN_SDK_BASE="$2"
99 METHOD="$3"
100 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(WIN_SDK_BASE)
101 if test -d "$WIN_SDK_BASE"; then
102 # There have been cases of partial or broken SDK installations. A missing
103 # lib dir is not going to work.
104 if test ! -d "$WIN_SDK_BASE/lib"; then
105 AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
106 AC_MSG_NOTICE([Warning: Installation is broken, lib dir is missing. Ignoring])
107 elif test -f "$WIN_SDK_BASE/Bin/SetEnv.Cmd"; then
108 AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
109 VS_ENV_CMD="$WIN_SDK_BASE/Bin/SetEnv.Cmd"
110 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
111 VS_ENV_ARGS="/x86"
112 else
113 VS_ENV_ARGS="/x64"
114 fi
115 # PLATFORM_TOOLSET is used during the compilation of the freetype sources (see
116 # 'LIB_BUILD_FREETYPE' in libraries.m4) and must be 'Windows7.1SDK' for Windows7.1SDK
117 # TODO: improve detection for other versions of SDK
118 eval PLATFORM_TOOLSET="\${VS_SDK_PLATFORM_NAME_${VS_VERSION}}"
119 else
120 AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
121 AC_MSG_NOTICE([Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring])
122 fi
123 fi
124 fi
125 ])
127 ################################################################################
128 # Finds the bat or cmd file in Visual Studio or the SDK that sets up a proper
129 # build environment and assigns it to VS_ENV_CMD
130 AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
131 [
132 VS_VERSION="$1"
133 eval VS_COMNTOOLS_VAR="\${VS_ENVVAR_${VS_VERSION}}"
134 eval VS_COMNTOOLS="\$${VS_COMNTOOLS_VAR}"
135 eval VS_INSTALL_DIR="\${VS_VS_INSTALLDIR_${VS_VERSION}}"
136 eval SDK_INSTALL_DIR="\${VS_SDK_INSTALLDIR_${VS_VERSION}}"
138 # When using --with-tools-dir, assume it points to the correct and default
139 # version of Visual Studio or that --with-toolchain-version was also set.
140 if test "x$with_tools_dir" != x; then
141 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
142 [$with_tools_dir/../..], [--with-tools-dir])
143 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
144 [$with_tools_dir/../../..], [--with-tools-dir])
145 if test "x$VS_ENV_CMD" = x; then
146 # Having specified an argument which is incorrect will produce an instant failure;
147 # we should not go on looking
148 AC_MSG_NOTICE([The path given by --with-tools-dir does not contain a valid])
149 AC_MSG_NOTICE([Visual Studio installation. Please point to the VC/bin or VC/bin/amd64])
150 AC_MSG_NOTICE([directory within the Visual Studio installation])
151 AC_MSG_ERROR([Cannot locate a valid Visual Studio installation])
152 fi
153 fi
155 VS_ENV_CMD=""
156 VS_ENV_ARGS=""
158 if test "x$VS_COMNTOOLS" != x; then
159 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
160 [$VS_COMNTOOLS/../..], [$VS_COMNTOOLS_VAR variable])
161 fi
162 if test "x$PROGRAMFILES" != x; then
163 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
164 [$PROGRAMFILES/$VS_INSTALL_DIR], [well-known name])
165 fi
166 # Work around the insanely named ProgramFiles(x86) env variable
167 PROGRAMFILES_X86="`env | $SED -n 's/^ProgramFiles(x86)=//p'`"
168 if test "x$PROGRAMFILES_X86" != x; then
169 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
170 [$PROGRAMFILES_X86/$VS_INSTALL_DIR], [well-known name])
171 fi
172 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
173 [C:/Program Files/$VS_INSTALL_DIR], [well-known name])
174 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
175 [C:/Program Files (x86)/$VS_INSTALL_DIR], [well-known name])
177 if test "x$SDK_INSTALL_DIR" != x; then
178 if test "x$ProgramW6432" != x; then
179 TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([${VS_VERSION}],
180 [$ProgramW6432/$SDK_INSTALL_DIR], [well-known name])
181 fi
182 if test "x$PROGRAMW6432" != x; then
183 TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([${VS_VERSION}],
184 [$PROGRAMW6432/$SDK_INSTALL_DIR], [well-known name])
185 fi
186 if test "x$PROGRAMFILES" != x; then
187 TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([${VS_VERSION}],
188 [$PROGRAMFILES/$SDK_INSTALL_DIR], [well-known name])
189 fi
190 TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([${VS_VERSION}],
191 [C:/Program Files/$SDK_INSTALL_DIR], [well-known name])
192 TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([${VS_VERSION}],
193 [C:/Program Files (x86)/$SDK_INSTALL_DIR], [well-known name])
194 fi
195 ])
197 ################################################################################
199 AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO],
200 [
201 AC_ARG_WITH(toolchain-version, [AS_HELP_STRING([--with-toolchain-version],
202 [the version of the toolchain to look for, use '--help' to show possible values @<:@platform dependent@:>@])])
204 if test "x$with_toolchain_version" = xlist; then
205 # List all toolchains
206 AC_MSG_NOTICE([The following toolchain versions are valid on this platform:])
207 for version in $VALID_VS_VERSIONS; do
208 eval VS_DESCRIPTION=\${VS_DESCRIPTION_$version}
209 $PRINTF " %-10s %s\n" $version "$VS_DESCRIPTION"
210 done
212 exit 0
213 elif test "x$with_toolchain_version" != x; then
214 # User override; check that it is valid
215 if test "x${VALID_VS_VERSIONS/$with_toolchain_version/}" = "x${VALID_VS_VERSIONS}"; then
216 AC_MSG_NOTICE([Visual Studio version $with_toolchain_version is not valid.])
217 AC_MSG_NOTICE([Valid Visual Studio versions: $VALID_VS_VERSIONS.])
218 AC_MSG_ERROR([Cannot continue.])
219 fi
220 VS_VERSIONS_PROBE_LIST="$with_toolchain_version"
221 else
222 # No flag given, use default
223 VS_VERSIONS_PROBE_LIST="$VALID_VS_VERSIONS"
224 fi
226 for VS_VERSION in $VS_VERSIONS_PROBE_LIST; do
227 TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE([$VS_VERSION])
228 if test "x$VS_ENV_CMD" != x; then
229 TOOLCHAIN_VERSION=$VS_VERSION
230 eval VS_DESCRIPTION="\${VS_DESCRIPTION_${VS_VERSION}}"
231 eval VS_VERSION_INTERNAL="\${VS_VERSION_INTERNAL_${VS_VERSION}}"
232 eval MSVCR_NAME="\${VS_MSVCR_${VS_VERSION}}"
233 eval MSVCP_NAME="\${VS_MSVCP_${VS_VERSION}}"
234 # The rest of the variables are already evaled while probing
235 AC_MSG_NOTICE([Found $VS_DESCRIPTION])
236 break
237 fi
238 done
239 ])
241 ################################################################################
242 # Check if the VS env variables were setup prior to running configure.
243 # If not, then find vcvarsall.bat and run it automatically, and integrate
244 # the set env variables into the spec file.
245 AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
246 [
247 # Store path to cygwin link.exe to help excluding it when searching for
248 # VS linker. This must be done before changing the PATH when looking for VS.
249 AC_PATH_PROG(CYGWIN_LINK, link)
250 if test "x$CYGWIN_LINK" != x; then
251 AC_MSG_CHECKING([if the first found link.exe is actually the Cygwin link tool])
252 "$CYGWIN_LINK" --version > /dev/null
253 if test $? -eq 0 ; then
254 AC_MSG_RESULT([yes])
255 else
256 AC_MSG_RESULT([no])
257 # This might be the VS linker. Don't exclude it later on.
258 CYGWIN_LINK=""
259 fi
260 fi
262 # First-hand choice is to locate and run the vsvars bat file.
263 TOOLCHAIN_FIND_VISUAL_STUDIO
265 if test "x$VS_ENV_CMD" != x; then
266 # We have found a Visual Studio environment on disk, let's extract variables from the vsvars bat file.
267 BASIC_FIXUP_EXECUTABLE(VS_ENV_CMD)
269 # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
270 AC_MSG_NOTICE([Trying to extract Visual Studio environment variables])
272 # We need to create a couple of temporary files.
273 VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
274 $MKDIR -p $VS_ENV_TMP_DIR
276 # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).
277 # Instead create a shell script which will set the relevant variables when run.
278 WINPATH_VS_ENV_CMD="$VS_ENV_CMD"
279 BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_VS_ENV_CMD])
280 WINPATH_BASH="$BASH"
281 BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_BASH])
283 # Generate a DOS batch file which runs $VS_ENV_CMD, and then creates a shell
284 # script (executable by bash) that will setup the important variables.
285 EXTRACT_VC_ENV_BAT_FILE="$VS_ENV_TMP_DIR/extract-vs-env.bat"
286 $ECHO "@echo off" > $EXTRACT_VC_ENV_BAT_FILE
287 # This will end up something like:
288 # call C:/progra~2/micros~2.0/vc/bin/amd64/vcvars64.bat
289 $ECHO "call $WINPATH_VS_ENV_CMD $VS_ENV_ARGS" >> $EXTRACT_VC_ENV_BAT_FILE
290 # These will end up something like:
291 # C:/CygWin/bin/bash -c 'echo VS_PATH=\"$PATH\" > localdevenv.sh
292 # The trailing space for everyone except PATH is no typo, but is needed due
293 # to trailing \ in the Windows paths. These will be stripped later.
294 $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
295 $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
296 $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
297 $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
298 $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
299 $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
301 # Now execute the newly created bat file.
302 # The | cat is to stop SetEnv.Cmd to mess with system colors on msys.
303 # Change directory so we don't need to mess with Windows paths in redirects.
304 cd $VS_ENV_TMP_DIR
305 cmd /c extract-vs-env.bat | $CAT
306 cd $CURDIR
308 if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then
309 AC_MSG_NOTICE([Could not succesfully extract the envionment variables needed for the VS setup.])
310 AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation])
311 AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
312 AC_MSG_ERROR([Cannot continue])
313 fi
315 # Now set all paths and other env variables. This will allow the rest of
316 # the configure script to find and run the compiler in the proper way.
317 AC_MSG_NOTICE([Setting extracted environment variables])
318 . $VS_ENV_TMP_DIR/set-vs-env.sh
319 # Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we
320 # also define VCINSTALLDIR, WindowsSdkDir and WINDOWSSDKDIR.
321 else
322 # We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
323 AC_MSG_NOTICE([Cannot locate a valid Visual Studio installation, checking current environment])
324 fi
326 # At this point, we should have correct variables in the environment, or we can't continue.
327 AC_MSG_CHECKING([for Visual Studio variables])
329 if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then
330 if test "x$VS_INCLUDE" = x || test "x$VS_LIB" = x; then
331 AC_MSG_RESULT([present but broken])
332 AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.])
333 else
334 AC_MSG_RESULT([ok])
335 # Remove any trailing "\" and " " from the variables.
336 VS_INCLUDE=`$ECHO "$VS_INCLUDE" | $SED 's/\\\\* *$//'`
337 VS_LIB=`$ECHO "$VS_LIB" | $SED 's/\\\\* *$//'`
338 VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'`
339 WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'`
340 WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'`
341 # Remove any paths containing # (typically F#) as that messes up make. This
342 # is needed if visual studio was installed with F# support.
343 VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[[^:#]]*#[^:]*://g'`
345 AC_SUBST(VS_PATH)
346 AC_SUBST(VS_INCLUDE)
347 AC_SUBST(VS_LIB)
348 fi
349 else
350 AC_MSG_RESULT([not found])
352 if test "x$VS_ENV_CMD" = x; then
353 AC_MSG_NOTICE([Cannot locate a valid Visual Studio or Windows SDK installation on disk,])
354 AC_MSG_NOTICE([nor is this script run from a Visual Studio command prompt.])
355 else
356 AC_MSG_NOTICE([Running the extraction script failed.])
357 fi
358 AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation])
359 AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
360 AC_MSG_ERROR([Cannot continue])
361 fi
362 ])
364 AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL],
365 [
366 DLL_NAME="$1"
367 POSSIBLE_MSVC_DLL="$2"
368 METHOD="$3"
369 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
370 AC_MSG_NOTICE([Found $1 at $POSSIBLE_MSVC_DLL using $METHOD])
372 # Need to check if the found msvcr is correct architecture
373 AC_MSG_CHECKING([found $1 architecture])
374 MSVC_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVC_DLL"`
375 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
376 # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
377 # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
378 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
379 CORRECT_MSVCR_ARCH="PE32 executable"
380 else
381 CORRECT_MSVCR_ARCH="PE32+ executable"
382 fi
383 else
384 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
385 CORRECT_MSVCR_ARCH=386
386 else
387 CORRECT_MSVCR_ARCH=x86-64
388 fi
389 fi
390 if $ECHO "$MSVC_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
391 AC_MSG_RESULT([ok])
392 MSVC_DLL="$POSSIBLE_MSVC_DLL"
393 AC_MSG_CHECKING([for $1])
394 AC_MSG_RESULT([$MSVC_DLL])
395 else
396 AC_MSG_RESULT([incorrect, ignoring])
397 AC_MSG_NOTICE([The file type of the located $1 is $MSVC_DLL_FILETYPE])
398 fi
399 fi
400 ])
402 AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
403 [
404 VAR_NAME="$1"
405 DLL_NAME="$2"
406 MSVC_DLL=
408 if test "x$MSVC_DLL" = x; then
409 # Probe: Using well-known location from Visual Studio 10.0
410 if test "x$VCINSTALLDIR" != x; then
411 CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
412 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VC_INSTALL_DIR)
413 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
414 POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
415 else
416 POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
417 fi
418 $ECHO "POSSIBLE_MSVC_DLL $POSSIBLEMSVC_DLL"
419 TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
420 [well-known location in VCINSTALLDIR])
421 fi
422 fi
424 if test "x$MSVC_DLL" = x; then
425 # Probe: Check in the Boot JDK directory.
426 POSSIBLE_MSVC_DLL="$BOOT_JDK/bin/$DLL_NAME"
427 TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL($[DLL_NAME], [$POSSIBLE_MSVC_DLL],
428 [well-known location in Boot JDK])
429 fi
431 if test "x$MSVC_DLL" = x; then
432 # Probe: Look in the Windows system32 directory
433 CYGWIN_SYSTEMROOT="$SYSTEMROOT"
434 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_SYSTEMROOT)
435 POSSIBLE_MSVC_DLL="$CYGWIN_SYSTEMROOT/system32/$DLL_NAME"
436 TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
437 [well-known location in SYSTEMROOT])
438 fi
440 if test "x$MSVC_DLL" = x; then
441 # Probe: If Visual Studio Express is installed, there is usually one with the debugger
442 if test "x$VS100COMNTOOLS" != x; then
443 CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
444 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR)
445 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
446 POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
447 | $GREP -i /x64/ | $HEAD --lines 1`
448 else
449 POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
450 | $GREP -i /x86/ | $HEAD --lines 1`
451 fi
452 TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
453 [search of VS100COMNTOOLS])
454 fi
455 fi
457 if test "x$MSVC_DLL" = x; then
458 # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
459 # (This was the original behaviour; kept since it might turn something up)
460 if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
461 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
462 POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
463 | $GREP x64 | $HEAD --lines 1`
464 else
465 POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
466 | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
467 if test "x$POSSIBLE_MSVC_DLL" = x; then
468 # We're grasping at straws now...
469 POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
470 | $HEAD --lines 1`
471 fi
472 fi
474 TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
475 [search of VCINSTALLDIR])
476 fi
477 fi
479 if test "x$MSVC_DLL" = x; then
480 AC_MSG_CHECKING([for $DLL_NAME])
481 AC_MSG_RESULT([no])
482 AC_MSG_ERROR([Could not find $DLL_NAME. Please specify using --with-msvcr-dll.])
483 fi
485 $1=$MSVC_DLL
486 BASIC_FIXUP_PATH($1)
487 AC_SUBST($1, [$]$1)
488 ])
490 AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
491 [
492 AC_ARG_WITH(msvcr-dll, [AS_HELP_STRING([--with-msvcr-dll],
493 [path to microsoft C runtime dll (msvcr*.dll) (Windows only) @<:@probed@:>@])])
495 if test "x$with_msvcr_dll" != x; then
496 # If given explicitely by user, do not probe. If not present, fail directly.
497 TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$with_msvcr_dll],
498 [--with-msvcr-dll])
499 if test "x$MSVC_DLL" = x; then
500 AC_MSG_ERROR([Could not find a proper $MSVCR_NAME as specified by --with-msvcr-dll])
501 fi
502 else
503 TOOLCHAIN_SETUP_MSVC_DLL([MSVCR_DLL], [${MSVCR_NAME}])
504 fi
506 AC_ARG_WITH(msvcp-dll, [AS_HELP_STRING([--with-msvcp-dll],
507 [path to microsoft C++ runtime dll (msvcp*.dll) (Windows only) @<:@probed@:>@])])
509 if test "x$MSVCP_NAME" != "x"; then
510 if test "x$with_msvcp_dll" != x; then
511 # If given explicitely by user, do not probe. If not present, fail directly.
512 TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$with_msvcp_dll],
513 [--with-msvcp-dll])
514 if test "x$MSVC_DLL" = x; then
515 AC_MSG_ERROR([Could not find a proper $MSVCP_NAME as specified by --with-msvcp-dll])
516 fi
517 else
518 TOOLCHAIN_SETUP_MSVC_DLL([MSVCP_DLL], [${MSVCP_NAME}])
519 fi
520 fi
521 ])
