Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8
提交
ef61200f
D
dragonwell8
项目概览
openanolis
/
dragonwell8
通知
5
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
ef61200f
编写于
4月 06, 2018
作者:
K
kevinw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8035751: Clean up Visual Studio detection logic
Reviewed-by: ihse, erikj, tbell
上级
8fb13c5d
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
120 addition
and
89 deletion
+120
-89
common/autoconf/generated-configure.sh
common/autoconf/generated-configure.sh
+69
-45
common/autoconf/toolchain.m4
common/autoconf/toolchain.m4
+6
-0
common/autoconf/toolchain_windows.m4
common/autoconf/toolchain_windows.m4
+45
-44
未找到文件。
common/autoconf/generated-configure.sh
浏览文件 @
ef61200f
...
@@ -772,9 +772,9 @@ POTENTIAL_CC
...
@@ -772,9 +772,9 @@ POTENTIAL_CC
SDKPATH
SDKPATH
XCODEBUILD
XCODEBUILD
SET_DEVELOPER_DIR
SET_DEVELOPER_DIR
VS_PATH
VS_LIB
VS_LIB
VS_INCLUDE
VS_INCLUDE
VS_PATH
CYGWIN_LINK
CYGWIN_LINK
EXE_SUFFIX
EXE_SUFFIX
OBJ_SUFFIX
OBJ_SUFFIX
...
@@ -4219,7 +4219,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
...
@@ -4219,7 +4219,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
#CUSTOM_AUTOCONF_INCLUDE
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=152
2941269
DATE_WHEN_GENERATED=152
3013158
###############################################################################
###############################################################################
#
#
...
@@ -25637,47 +25637,62 @@ $as_echo "$as_me: Rewriting VS_ENV_CMD to \"$new_complete\"" >&6;}
...
@@ -25637,47 +25637,62 @@ $as_echo "$as_me: Rewriting VS_ENV_CMD to \"$new_complete\"" >&6;}
# Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
# Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
{ $as_echo "$as_me:${as_lineno-$LINENO}: Trying to extract Visual Studio environment variables" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: Trying to extract Visual Studio environment variables" >&5
$as_echo "$as_me: Trying to extract Visual Studio environment variables" >&6;}
$as_echo "$as_me: Trying to extract Visual Studio environment variables" >&6;}
cd $OUTPUT_ROOT
# FIXME: The code betweeen ---- was inlined from a separate script and is not properly adapted
# to autoconf standards.
#----
# We need to create a couple of temporary files.
VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
$MKDIR -p $VS_ENV_TMP_DIR
# Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment)
# Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment)
.
#
but calculate the difference in Cygwin environment before/after running it and then
#
Instead create a shell script which will set the relevant variables when run.
# apply the diff.
WINPATH_VS_ENV_CMD="$VS_ENV_CMD"
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
unix_path="$WINPATH_VS_ENV_CMD"
_vs10varsall=`cygpath -a -m -s "$VS_ENV_CMD"`
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
_dosvs10varsall=`cygpath -a -w -s $_vs10varsall
`
windows_path=`$CYGPATH -m "$unix_path"
`
_dosbash=`cygpath -a -w -s \`which bash\`.*`
WINPATH_VS_ENV_CMD="$windows_path"
else
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
_dosvs10varsall=`cmd //c echo $VS_ENV_CMD
`
windows_path=`cmd //c echo $unix_path
`
_dosbash=`cmd //c echo \`which bash\``
WINPATH_VS_ENV_CMD="$windows_path"
fi
fi
# generate the set of exported vars before/after the vs10 setup
WINPATH_BASH="$BASH"
$ECHO "@echo off" > localdevenvtmp.bat
$ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export0" >> localdevenvtmp.bat
$ECHO "call $_dosvs10varsall $VS_ENV_ARGS" >> localdevenvtmp.bat
$ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export1" >> localdevenvtmp.bat
# Now execute the newly created bat file.
# The | cat is to stop SetEnv.Cmd to mess with system colors on msys
cmd /c localdevenvtmp.bat | cat
# apply the diff (less some non-vs10 vars named by "!")
unix_path="$WINPATH_BASH"
$SORT localdevenvtmp.export0 | $GREP -v "!" > localdevenvtmp.export0.sort
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
$SORT localdevenvtmp.export1 | $GREP -v "!" > localdevenvtmp.export1.sort
windows_path=`$CYGPATH -m "$unix_path"`
$COMM -1 -3 localdevenvtmp.export0.sort localdevenvtmp.export1.sort > localdevenv.sh
WINPATH_BASH="$windows_path"
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
windows_path=`cmd //c echo $unix_path`
WINPATH_BASH="$windows_path"
fi
# Generate a DOS batch file which runs $VS_ENV_CMD, and then creates a shell
# script (executable by bash) that will setup the important variables.
EXTRACT_VC_ENV_BAT_FILE="$VS_ENV_TMP_DIR/extract-vs-env.bat"
$ECHO "@echo off" > $EXTRACT_VC_ENV_BAT_FILE
# This will end up something like:
# call C:/progra~2/micros~2.0/vc/bin/amd64/vcvars64.bat
$ECHO "call $WINPATH_VS_ENV_CMD $VS_ENV_ARGS" >> $EXTRACT_VC_ENV_BAT_FILE
# These will end up something like:
# C:/CygWin/bin/bash -c 'echo VS_PATH=\"$PATH\" > localdevenv.sh
# The trailing space for everyone except PATH is no typo, but is needed due
# to trailing \ in the Windows paths. These will be stripped later.
$ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
# cleanup
# Now execute the newly created bat file.
$RM localdevenvtmp*
# The | cat is to stop SetEnv.Cmd to mess with system colors on msys.
#----
# Change directory so we don't need to mess with Windows paths in redirects.
cd $VS_ENV_TMP_DIR
cmd /c extract-vs-env.bat | $CAT
cd $CURDIR
cd $CURDIR
if test ! -s $OUTPUT_ROOT/localdevenv.sh; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then
$as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: Could not succesfully extract the envionment variables needed for the VS setup." >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: Could not succesfully extract the envionment variables needed for the VS setup." >&5
$as_echo "$as_me: Could not succesfully extract the envionment variables needed for the VS setup." >&6;}
$as_echo "$as_me: Could not succesfully extract the envionment variables needed for the VS setup." >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&5
...
@@ -25691,31 +25706,34 @@ $as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run c
...
@@ -25691,31 +25706,34 @@ $as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run c
# the configure script to find and run the compiler in the proper way.
# the configure script to find and run the compiler in the proper way.
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting extracted environment variables" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting extracted environment variables" >&5
$as_echo "$as_me: Setting extracted environment variables" >&6;}
$as_echo "$as_me: Setting extracted environment variables" >&6;}
. $OUTPUT_ROOT/localdevenv.sh
. $VS_ENV_TMP_DIR/set-vs-env.sh
# Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we
# also define VCINSTALLDIR, WindowsSdkDir and WINDOWSSDKDIR.
else
else
# We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
# We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
{ $as_echo "$as_me:${as_lineno-$LINENO}: Cannot locate a valid Visual Studio installation, checking current environment" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: Cannot locate a valid Visual Studio installation, checking current environment" >&5
$as_echo "$as_me: Cannot locate a valid Visual Studio installation, checking current environment" >&6;}
$as_echo "$as_me: Cannot locate a valid Visual Studio installation, checking current environment" >&6;}
fi
fi
# At this point, we should have corre
n
t variables in the environment, or we can't continue.
# At this point, we should have corre
c
t variables in the environment, or we can't continue.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Visual Studio variables" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Visual Studio variables" >&5
$as_echo_n "checking for Visual Studio variables... " >&6; }
$as_echo_n "checking for Visual Studio variables... " >&6; }
if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then
if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then
if test "x$
INCLUDE" = x || test "x$
LIB" = x; then
if test "x$
VS_INCLUDE" = x || test "x$VS_
LIB" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: present but broken" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: present but broken" >&5
$as_echo "present but broken" >&6; }
$as_echo "present but broken" >&6; }
as_fn_error $? "Your VC command prompt seems broken, INCLUDE and/or LIB is missing." "$LINENO" 5
as_fn_error $? "Your VC command prompt seems broken, INCLUDE and/or LIB is missing." "$LINENO" 5
else
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
$as_echo "ok" >&6; }
# Remove any trailing \ from INCLUDE and LIB to avoid trouble in spec.gmk.
# Remove any trailing "\" and " " from the variables.
VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'`
VS_INCLUDE=`$ECHO "$VS_INCLUDE" | $SED 's/\\\\* *$//'`
VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'`
VS_LIB=`$ECHO "$VS_LIB" | $SED 's/\\\\* *$//'`
# Remove any paths containing # (typically F#) as that messes up make
VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'`
PATH=`$ECHO "$PATH" | $SED 's/[^:#]*#[^:]*://g'`
WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'`
VS_PATH="$PATH"
WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'`
...
@@ -25740,6 +25758,12 @@ $as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run c
...
@@ -25740,6 +25758,12 @@ $as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run c
as_fn_error $? "Cannot continue" "$LINENO" 5
as_fn_error $? "Cannot continue" "$LINENO" 5
fi
fi
# Reset path to VS_PATH. It will include everything that was on PATH at the time we
# ran TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV.
PATH="$VS_PATH"
# The microsoft toolchain also requires INCLUDE and LIB to be set.
export INCLUDE="$VS_INCLUDE"
export LIB="$VS_LIB"
fi
fi
# autoconf magic only relies on PATH, so update it if tools dir is specified
# autoconf magic only relies on PATH, so update it if tools dir is specified
common/autoconf/toolchain.m4
浏览文件 @
ef61200f
...
@@ -223,6 +223,12 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
...
@@ -223,6 +223,12 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
# it for DLL resolution in runtime.
# it for DLL resolution in runtime.
if test "x$OPENJDK_BUILD_OS" = "xwindows" && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
if test "x$OPENJDK_BUILD_OS" = "xwindows" && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
# Reset path to VS_PATH. It will include everything that was on PATH at the time we
# ran TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV.
PATH="$VS_PATH"
# The microsoft toolchain also requires INCLUDE and LIB to be set.
export INCLUDE="$VS_INCLUDE"
export LIB="$VS_LIB"
fi
fi
# autoconf magic only relies on PATH, so update it if tools dir is specified
# autoconf magic only relies on PATH, so update it if tools dir is specified
...
...
common/autoconf/toolchain_windows.m4
浏览文件 @
ef61200f
...
@@ -141,46 +141,44 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
...
@@ -141,46 +141,44 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
# Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
# Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
AC_MSG_NOTICE([Trying to extract Visual Studio environment variables])
AC_MSG_NOTICE([Trying to extract Visual Studio environment variables])
cd $OUTPUT_ROOT
# FIXME: The code betweeen ---- was inlined from a separate script and is not properly adapted
# to autoconf standards.
#----
# We need to create a couple of temporary files.
VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
# Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment)
$MKDIR -p $VS_ENV_TMP_DIR
# but calculate the difference in Cygwin environment before/after running it and then
# apply the diff.
# Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).
# Instead create a shell script which will set the relevant variables when run.
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
WINPATH_VS_ENV_CMD="$VS_ENV_CMD"
_vs10varsall=`cygpath -a -m -s "$VS_ENV_CMD"`
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_VS_ENV_CMD])
_dosvs10varsall=`cygpath -a -w -s $_vs10varsall`
WINPATH_BASH="$BASH"
_dosbash=`cygpath -a -w -s \`which bash\`.*`
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_BASH])
else
_dosvs10varsall=`cmd //c echo $VS_ENV_CMD`
# Generate a DOS batch file which runs $VS_ENV_CMD, and then creates a shell
_dosbash=`cmd //c echo \`which bash\``
# script (executable by bash) that will setup the important variables.
fi
EXTRACT_VC_ENV_BAT_FILE="$VS_ENV_TMP_DIR/extract-vs-env.bat"
$ECHO "@echo off" > $EXTRACT_VC_ENV_BAT_FILE
# generate the set of exported vars before/after the vs10 setup
# This will end up something like:
$ECHO "@echo off" > localdevenvtmp.bat
# call C:/progra~2/micros~2.0/vc/bin/amd64/vcvars64.bat
$ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export0" >> localdevenvtmp.bat
$ECHO "call $WINPATH_VS_ENV_CMD $VS_ENV_ARGS" >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "call $_dosvs10varsall $VS_ENV_ARGS" >> localdevenvtmp.bat
# These will end up something like:
$ECHO "$_dosbash -c \"export -p\" > localdevenvtmp.export1" >> localdevenvtmp.bat
# C:/CygWin/bin/bash -c 'echo VS_PATH=\"$PATH\" > localdevenv.sh
# The trailing space for everyone except PATH is no typo, but is needed due
# to trailing \ in the Windows paths. These will be stripped later.
$ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
# Now execute the newly created bat file.
# Now execute the newly created bat file.
# The | cat is to stop SetEnv.Cmd to mess with system colors on msys
# The | cat is to stop SetEnv.Cmd to mess with system colors on msys.
cmd /c localdevenvtmp.bat | cat
# Change directory so we don't need to mess with Windows paths in redirects.
cd $VS_ENV_TMP_DIR
# apply the diff (less some non-vs10 vars named by "!")
cmd /c extract-vs-env.bat | $CAT
$SORT localdevenvtmp.export0 | $GREP -v "!" > localdevenvtmp.export0.sort
$SORT localdevenvtmp.export1 | $GREP -v "!" > localdevenvtmp.export1.sort
$COMM -1 -3 localdevenvtmp.export0.sort localdevenvtmp.export1.sort > localdevenv.sh
# cleanup
$RM localdevenvtmp*
#----
cd $CURDIR
cd $CURDIR
if test ! -s $OUTPUT_ROOT/localdevenv.sh; then
AC_MSG_RESULT([no])
if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then
AC_MSG_NOTICE([Could not succesfully extract the envionment variables needed for the VS setup.])
AC_MSG_NOTICE([Could not succesfully extract the envionment variables needed for the VS setup.])
AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation])
AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation])
AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
...
@@ -190,30 +188,33 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
...
@@ -190,30 +188,33 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
# Now set all paths and other env variables. This will allow the rest of
# Now set all paths and other env variables. This will allow the rest of
# the configure script to find and run the compiler in the proper way.
# the configure script to find and run the compiler in the proper way.
AC_MSG_NOTICE([Setting extracted environment variables])
AC_MSG_NOTICE([Setting extracted environment variables])
. $OUTPUT_ROOT/localdevenv.sh
. $VS_ENV_TMP_DIR/set-vs-env.sh
# Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we
# also define VCINSTALLDIR, WindowsSdkDir and WINDOWSSDKDIR.
else
else
# We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
# We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
AC_MSG_NOTICE([Cannot locate a valid Visual Studio installation, checking current environment])
AC_MSG_NOTICE([Cannot locate a valid Visual Studio installation, checking current environment])
fi
fi
# At this point, we should have corre
n
t variables in the environment, or we can't continue.
# At this point, we should have corre
c
t variables in the environment, or we can't continue.
AC_MSG_CHECKING([for Visual Studio variables])
AC_MSG_CHECKING([for Visual Studio variables])
if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then
if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then
if test "x$
INCLUDE" = x || test "x$
LIB" = x; then
if test "x$
VS_INCLUDE" = x || test "x$VS_
LIB" = x; then
AC_MSG_RESULT([present but broken])
AC_MSG_RESULT([present but broken])
AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.])
AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.])
else
else
AC_MSG_RESULT([ok])
AC_MSG_RESULT([ok])
# Remove any trailing \ from INCLUDE and LIB to avoid trouble in spec.gmk.
# Remove any trailing "\" and " " from the variables.
VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'`
VS_INCLUDE=`$ECHO "$VS_INCLUDE" | $SED 's/\\\\* *$//'`
VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'`
VS_LIB=`$ECHO "$VS_LIB" | $SED 's/\\\\* *$//'`
# Remove any paths containing # (typically F#) as that messes up make
VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'`
PATH=`$ECHO "$PATH" | $SED 's/[[^:#]]*#[^:]*://g'`
WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'`
VS_PATH="$PATH"
WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'`
AC_SUBST(VS_PATH)
AC_SUBST(VS_INCLUDE)
AC_SUBST(VS_INCLUDE)
AC_SUBST(VS_LIB)
AC_SUBST(VS_LIB)
AC_SUBST(VS_PATH)
fi
fi
else
else
AC_MSG_RESULT([not found])
AC_MSG_RESULT([not found])
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录