author | iignatyev |
Mon, 23 Dec 2013 18:39:47 +0000 | |
changeset 22195 | c39aa322d33a |
parent 20643 | fa095e917446 |
child 23429 | fe4f0848a307 |
permissions | -rw-r--r-- |
14111 | 1 |
# |
2 |
# Copyright (c) 2011, 2012, 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 |
# |
|
25 |
||
26 |
AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT], |
|
27 |
[ |
|
28 |
if test "x$VS_ENV_CMD" = x; then |
|
29 |
VS100BASE="$1" |
|
30 |
METHOD="$2" |
|
31 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS100BASE) |
|
32 |
if test -d "$VS100BASE"; then |
|
33 |
if test -f "$VS100BASE/$VCVARSFILE"; then |
|
34 |
AC_MSG_NOTICE([Found Visual Studio installation at $VS100BASE using $METHOD]) |
|
35 |
VS_ENV_CMD="$VS100BASE/$VCVARSFILE" |
|
36 |
else |
|
37 |
AC_MSG_NOTICE([Found Visual Studio installation at $VS100BASE using $METHOD]) |
|
38 |
AC_MSG_NOTICE([Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring]) |
|
39 |
fi |
|
40 |
fi |
|
41 |
fi |
|
42 |
]) |
|
43 |
||
44 |
AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT], |
|
45 |
[ |
|
46 |
if test "x$VS_ENV_CMD" = x; then |
|
47 |
WIN_SDK_BASE="$1" |
|
48 |
METHOD="$2" |
|
49 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(WIN_SDK_BASE) |
|
50 |
if test -d "$WIN_SDK_BASE"; then |
|
14565 | 51 |
# There have been cases of partial or broken SDK installations. A missing |
52 |
# lib dir is not going to work. |
|
53 |
if test ! -d "$WIN_SDK_BASE/../lib"; then |
|
54 |
AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD]) |
|
55 |
AC_MSG_NOTICE([Warning: Installation is broken, lib dir is missing. Ignoring]) |
|
56 |
elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then |
|
14111 | 57 |
AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD]) |
58 |
VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" |
|
59 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then |
|
60 |
VS_ENV_ARGS="/x86" |
|
61 |
else |
|
62 |
VS_ENV_ARGS="/x64" |
|
63 |
fi |
|
64 |
else |
|
65 |
AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD]) |
|
66 |
AC_MSG_NOTICE([Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring]) |
|
67 |
fi |
|
68 |
fi |
|
69 |
fi |
|
70 |
]) |
|
71 |
||
72 |
AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE], |
|
73 |
[ |
|
74 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then |
|
75 |
VCVARSFILE="vc/bin/vcvars32.bat" |
|
76 |
else |
|
77 |
VCVARSFILE="vc/bin/amd64/vcvars64.bat" |
|
20363 | 78 |
fi |
14111 | 79 |
|
80 |
VS_ENV_CMD="" |
|
81 |
VS_ENV_ARGS="" |
|
82 |
if test "x$with_toolsdir" != x; then |
|
83 |
TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$with_toolsdir/../..], [--with-tools-dir]) |
|
84 |
fi |
|
85 |
||
86 |
if test "x$with_toolsdir" != x && test "x$VS_ENV_CMD" = x; then |
|
87 |
# Having specified an argument which is incorrect will produce an instant failure; |
|
88 |
# we should not go on looking |
|
89 |
AC_MSG_NOTICE([The path given by --with-tools-dir does not contain a valid Visual Studio installation]) |
|
90 |
AC_MSG_NOTICE([Please point to the VC/bin directory within the Visual Studio installation]) |
|
91 |
AC_MSG_ERROR([Cannot locate a valid Visual Studio installation]) |
|
20363 | 92 |
fi |
14111 | 93 |
|
17818
cfaa38a17d56
8008707: build-infra: Closed (deploy) can't be built using environment from SDK SetEnv.cmd
erikj
parents:
15844
diff
changeset
|
94 |
if test "x$VS100COMNTOOLS" != x; then |
cfaa38a17d56
8008707: build-infra: Closed (deploy) can't be built using environment from SDK SetEnv.cmd
erikj
parents:
15844
diff
changeset
|
95 |
TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$VS100COMNTOOLS/../..], [VS100COMNTOOLS variable]) |
cfaa38a17d56
8008707: build-infra: Closed (deploy) can't be built using environment from SDK SetEnv.cmd
erikj
parents:
15844
diff
changeset
|
96 |
fi |
cfaa38a17d56
8008707: build-infra: Closed (deploy) can't be built using environment from SDK SetEnv.cmd
erikj
parents:
15844
diff
changeset
|
97 |
if test "x$PROGRAMFILES" != x; then |
cfaa38a17d56
8008707: build-infra: Closed (deploy) can't be built using environment from SDK SetEnv.cmd
erikj
parents:
15844
diff
changeset
|
98 |
TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$PROGRAMFILES/Microsoft Visual Studio 10.0], [well-known name]) |
cfaa38a17d56
8008707: build-infra: Closed (deploy) can't be built using environment from SDK SetEnv.cmd
erikj
parents:
15844
diff
changeset
|
99 |
fi |
cfaa38a17d56
8008707: build-infra: Closed (deploy) can't be built using environment from SDK SetEnv.cmd
erikj
parents:
15844
diff
changeset
|
100 |
TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([C:/Program Files/Microsoft Visual Studio 10.0], [well-known name]) |
cfaa38a17d56
8008707: build-infra: Closed (deploy) can't be built using environment from SDK SetEnv.cmd
erikj
parents:
15844
diff
changeset
|
101 |
TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([C:/Program Files (x86)/Microsoft Visual Studio 10.0], [well-known name]) |
cfaa38a17d56
8008707: build-infra: Closed (deploy) can't be built using environment from SDK SetEnv.cmd
erikj
parents:
15844
diff
changeset
|
102 |
|
14111 | 103 |
if test "x$ProgramW6432" != x; then |
104 |
TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$ProgramW6432/Microsoft SDKs/Windows/v7.1/Bin], [well-known name]) |
|
105 |
fi |
|
106 |
if test "x$PROGRAMW6432" != x; then |
|
107 |
TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$PROGRAMW6432/Microsoft SDKs/Windows/v7.1/Bin], [well-known name]) |
|
108 |
fi |
|
109 |
if test "x$PROGRAMFILES" != x; then |
|
110 |
TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$PROGRAMFILES/Microsoft SDKs/Windows/v7.1/Bin], [well-known name]) |
|
111 |
fi |
|
112 |
TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([C:/Program Files/Microsoft SDKs/Windows/v7.1/Bin], [well-known name]) |
|
113 |
TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1/Bin], [well-known name]) |
|
114 |
]) |
|
115 |
||
116 |
# Check if the VS env variables were setup prior to running configure. |
|
117 |
# If not, then find vcvarsall.bat and run it automatically, and integrate |
|
118 |
# the set env variables into the spec file. |
|
119 |
AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV], |
|
120 |
[ |
|
20363 | 121 |
# Store path to cygwin link.exe to help excluding it when searching for |
14111 | 122 |
# VS linker. This must be done before changing the PATH when looking for VS. |
123 |
AC_PATH_PROG(CYGWIN_LINK, link) |
|
124 |
if test "x$CYGWIN_LINK" != x; then |
|
125 |
AC_MSG_CHECKING([if the first found link.exe is actually the Cygwin link tool]) |
|
126 |
"$CYGWIN_LINK" --version > /dev/null |
|
127 |
if test $? -eq 0 ; then |
|
128 |
AC_MSG_RESULT([yes]) |
|
129 |
else |
|
130 |
AC_MSG_RESULT([no]) |
|
131 |
# This might be the VS linker. Don't exclude it later on. |
|
132 |
CYGWIN_LINK="" |
|
133 |
fi |
|
134 |
fi |
|
135 |
||
136 |
# First-hand choice is to locate and run the vsvars bat file. |
|
137 |
TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE |
|
138 |
if test "x$VS_ENV_CMD" != x; then |
|
139 |
# We have found a Visual Studio environment on disk, let's extract variables from the vsvars bat file. |
|
140 |
BASIC_FIXUP_EXECUTABLE(VS_ENV_CMD) |
|
141 |
||
142 |
# Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat |
|
143 |
AC_MSG_NOTICE([Trying to extract Visual Studio environment variables]) |
|
144 |
cd $OUTPUT_ROOT |
|
145 |
# FIXME: The code betweeen ---- was inlined from a separate script and is not properly adapted |
|
146 |
# to autoconf standards. |
|
147 |
||
148 |
#---- |
|
149 |
||
150 |
# Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment) |
|
151 |
# but calculate the difference in Cygwin environment before/after running it and then |
|
152 |
# apply the diff. |
|
153 |
||
154 |
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then |
|
155 |
_vs10varsall=`cygpath -a -m -s "$VS_ENV_CMD"` |
|
156 |
_dosvs10varsall=`cygpath -a -w -s $_vs10varsall` |
|
157 |
_dosbash=`cygpath -a -w -s \`which bash\`.*` |
|
158 |
else |
|
159 |
_dosvs10varsall=`cmd //c echo $VS_ENV_CMD` |
|
160 |
_dosbash=`cmd //c echo \`which bash\`` |
|
161 |
fi |
|
162 |
||
163 |
# generate the set of exported vars before/after the vs10 setup |
|
164 |
$ECHO "@echo off" > localdevenvtmp.bat |
|
165 |
$ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export0" >> localdevenvtmp.bat |
|
166 |
$ECHO "call $_dosvs10varsall $VS_ENV_ARGS" >> localdevenvtmp.bat |
|
167 |
$ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export1" >> localdevenvtmp.bat |
|
168 |
||
169 |
# Now execute the newly created bat file. |
|
170 |
# The | cat is to stop SetEnv.Cmd to mess with system colors on msys |
|
171 |
cmd /c localdevenvtmp.bat | cat |
|
172 |
||
173 |
# apply the diff (less some non-vs10 vars named by "!") |
|
174 |
$SORT localdevenvtmp.export0 | $GREP -v "!" > localdevenvtmp.export0.sort |
|
175 |
$SORT localdevenvtmp.export1 | $GREP -v "!" > localdevenvtmp.export1.sort |
|
176 |
$COMM -1 -3 localdevenvtmp.export0.sort localdevenvtmp.export1.sort > localdevenv.sh |
|
177 |
||
178 |
# cleanup |
|
179 |
$RM localdevenvtmp* |
|
180 |
#---- |
|
181 |
cd $CURDIR |
|
182 |
if test ! -s $OUTPUT_ROOT/localdevenv.sh; then |
|
183 |
AC_MSG_RESULT([no]) |
|
184 |
AC_MSG_NOTICE([Could not succesfully extract the envionment variables needed for the VS setup.]) |
|
185 |
AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation]) |
|
186 |
AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.]) |
|
187 |
AC_MSG_ERROR([Cannot continue]) |
|
188 |
fi |
|
189 |
||
20363 | 190 |
# Now set all paths and other env variables. This will allow the rest of |
14111 | 191 |
# the configure script to find and run the compiler in the proper way. |
192 |
AC_MSG_NOTICE([Setting extracted environment variables]) |
|
193 |
. $OUTPUT_ROOT/localdevenv.sh |
|
194 |
else |
|
195 |
# We did not find a vsvars bat file, let's hope we are run from a VS command prompt. |
|
196 |
AC_MSG_NOTICE([Cannot locate a valid Visual Studio installation, checking current environment]) |
|
197 |
fi |
|
198 |
||
199 |
# At this point, we should have corrent variables in the environment, or we can't continue. |
|
200 |
AC_MSG_CHECKING([for Visual Studio variables]) |
|
20363 | 201 |
|
14111 | 202 |
if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then |
203 |
if test "x$INCLUDE" = x || test "x$LIB" = x; then |
|
204 |
AC_MSG_RESULT([present but broken]) |
|
205 |
AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.]) |
|
206 |
else |
|
207 |
AC_MSG_RESULT([ok]) |
|
14562
ab12d5824d04
8003819: build-infra: backslashes at end of LIB and INCLUDE in spec.gmk
erikj
parents:
14111
diff
changeset
|
208 |
# Remove any trailing \ from INCLUDE and LIB to avoid trouble in spec.gmk. |
ab12d5824d04
8003819: build-infra: backslashes at end of LIB and INCLUDE in spec.gmk
erikj
parents:
14111
diff
changeset
|
209 |
VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'` |
ab12d5824d04
8003819: build-infra: backslashes at end of LIB and INCLUDE in spec.gmk
erikj
parents:
14111
diff
changeset
|
210 |
VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'` |
18476
99bf8dc53505
8009315: F# on PATH breaks Cygwin tools (mkdir, echo, mktemp ...)
tbell
parents:
17818
diff
changeset
|
211 |
# Remove any paths containing # (typically F#) as that messes up make |
99bf8dc53505
8009315: F# on PATH breaks Cygwin tools (mkdir, echo, mktemp ...)
tbell
parents:
17818
diff
changeset
|
212 |
PATH=`$ECHO "$PATH" | $SED 's/[[^:#]]*#[^:]*://g'` |
14111 | 213 |
VS_PATH="$PATH" |
214 |
AC_SUBST(VS_INCLUDE) |
|
215 |
AC_SUBST(VS_LIB) |
|
216 |
AC_SUBST(VS_PATH) |
|
217 |
fi |
|
218 |
else |
|
219 |
AC_MSG_RESULT([not found]) |
|
220 |
||
221 |
if test "x$VS_ENV_CMD" = x; then |
|
222 |
AC_MSG_NOTICE([Cannot locate a valid Visual Studio or Windows SDK installation on disk,]) |
|
223 |
AC_MSG_NOTICE([nor is this script run from a Visual Studio command prompt.]) |
|
224 |
else |
|
225 |
AC_MSG_NOTICE([Running the extraction script failed.]) |
|
226 |
fi |
|
227 |
AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation]) |
|
228 |
AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.]) |
|
229 |
AC_MSG_ERROR([Cannot continue]) |
|
230 |
fi |
|
20643 | 231 |
]) |
20363 | 232 |
|
20643 | 233 |
AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL], |
234 |
[ |
|
235 |
POSSIBLE_MSVCR_DLL="$1" |
|
236 |
METHOD="$2" |
|
237 |
if test -e "$POSSIBLE_MSVCR_DLL"; then |
|
238 |
AC_MSG_NOTICE([Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD]) |
|
239 |
||
240 |
# Need to check if the found msvcr is correct architecture |
|
241 |
AC_MSG_CHECKING([found msvcr100.dll architecture]) |
|
242 |
MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` |
|
243 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then |
|
244 |
CORRECT_MSVCR_ARCH=386 |
|
245 |
else |
|
246 |
CORRECT_MSVCR_ARCH=x86-64 |
|
247 |
fi |
|
248 |
if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then |
|
249 |
AC_MSG_RESULT([ok]) |
|
250 |
MSVCR_DLL="$POSSIBLE_MSVCR_DLL" |
|
251 |
AC_MSG_CHECKING([for msvcr100.dll]) |
|
252 |
AC_MSG_RESULT([$MSVCR_DLL]) |
|
253 |
else |
|
254 |
AC_MSG_RESULT([incorrect, ignoring]) |
|
255 |
AC_MSG_NOTICE([The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE]) |
|
256 |
fi |
|
257 |
fi |
|
258 |
]) |
|
259 |
||
260 |
AC_DEFUN([TOOLCHAIN_SETUP_MSVCR_DLL], |
|
261 |
[ |
|
14111 | 262 |
AC_ARG_WITH(msvcr-dll, [AS_HELP_STRING([--with-msvcr-dll], |
263 |
[copy this msvcr100.dll into the built JDK (Windows only) @<:@probed@:>@])]) |
|
20643 | 264 |
|
14111 | 265 |
if test "x$with_msvcr_dll" != x; then |
20643 | 266 |
# If given explicitely by user, do not probe. If not present, fail directly. |
267 |
TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$with_msvcr_dll], [--with-msvcr-dll]) |
|
268 |
if test "x$MSVCR_DLL" = x; then |
|
269 |
AC_MSG_ERROR([Could not find a proper msvcr100.dll as specified by --with-msvcr-dll]) |
|
270 |
fi |
|
271 |
fi |
|
272 |
||
273 |
if test "x$MSVCR_DLL" = x; then |
|
274 |
# Probe: Using well-known location from Visual Studio 10.0 |
|
14111 | 275 |
if test "x$VCINSTALLDIR" != x; then |
20643 | 276 |
CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR" |
277 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VC_INSTALL_DIR) |
|
14111 | 278 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
20643 | 279 |
POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcr100.dll" |
14111 | 280 |
else |
20643 | 281 |
POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcr100.dll" |
282 |
fi |
|
283 |
TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in VCINSTALLDIR]) |
|
284 |
fi |
|
285 |
fi |
|
286 |
||
287 |
if test "x$MSVCR_DLL" = x; then |
|
288 |
# Probe: Check in the Boot JDK directory. |
|
289 |
POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll" |
|
290 |
TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in Boot JDK]) |
|
291 |
fi |
|
292 |
||
293 |
if test "x$MSVCR_DLL" = x; then |
|
294 |
# Probe: Look in the Windows system32 directory |
|
295 |
CYGWIN_SYSTEMROOT="$SYSTEMROOT" |
|
296 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_SYSTEMROOT) |
|
297 |
POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll" |
|
298 |
TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in SYSTEMROOT]) |
|
299 |
fi |
|
300 |
||
301 |
if test "x$MSVCR_DLL" = x; then |
|
302 |
# Probe: If Visual Studio Express is installed, there is usually one with the debugger |
|
303 |
if test "x$VS100COMNTOOLS" != x; then |
|
304 |
CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.." |
|
305 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR) |
|
306 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
|
307 |
POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x64/ | $HEAD --lines 1` |
|
308 |
else |
|
309 |
POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1` |
|
310 |
fi |
|
311 |
TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VS100COMNTOOLS]) |
|
312 |
fi |
|
313 |
fi |
|
314 |
||
315 |
if test "x$MSVCR_DLL" = x; then |
|
316 |
# Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now. |
|
317 |
# (This was the original behaviour; kept since it might turn up something) |
|
318 |
if test "x$CYGWIN_VC_INSTALL_DIR" != x; then |
|
319 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
|
320 |
POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x64 | $HEAD --lines 1` |
|
321 |
else |
|
322 |
POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1` |
|
323 |
if test "x$POSSIBLE_MSVCR_DLL" = x; then |
|
324 |
# We're grasping at straws now... |
|
325 |
POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1` |
|
14111 | 326 |
fi |
327 |
fi |
|
20643 | 328 |
|
329 |
TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VCINSTALLDIR]) |
|
14111 | 330 |
fi |
331 |
fi |
|
20643 | 332 |
|
14111 | 333 |
if test "x$MSVCR_DLL" = x; then |
20643 | 334 |
AC_MSG_CHECKING([for msvcr100.dll]) |
14111 | 335 |
AC_MSG_RESULT([no]) |
20643 | 336 |
AC_MSG_ERROR([Could not find msvcr100.dll. Please specify using --with-msvcr-dll.]) |
14111 | 337 |
fi |
20643 | 338 |
|
14111 | 339 |
BASIC_FIXUP_PATH(MSVCR_DLL) |
340 |
]) |