зеркало из https://github.com/mozilla/gecko-dev.git
Bug 550811 - bustage on Windows x64 buiild for js-ctypes. r=ted
This commit is contained in:
Родитель
cdc6441716
Коммит
00a1a4c107
11
configure.in
11
configure.in
|
@ -8738,7 +8738,16 @@ if test "$BUILD_CTYPES"; then
|
||||||
if test "$_MSC_VER"; then
|
if test "$_MSC_VER"; then
|
||||||
# Use a wrapper script for cl and ml that looks more like gcc.
|
# Use a wrapper script for cl and ml that looks more like gcc.
|
||||||
# autotools can't quite handle an MSVC build environment yet.
|
# autotools can't quite handle an MSVC build environment yet.
|
||||||
ac_configure_args="$ac_configure_args CC=$_topsrcdir/js/ctypes/libffi/msvcc.sh LD=link CPP=\"cl -nologo -EP\" SHELL=sh.exe"
|
ac_configure_args="$ac_configure_args LD=link CPP=\"cl -nologo -EP\" SHELL=sh.exe"
|
||||||
|
case "${target_cpu}" in
|
||||||
|
x86_64)
|
||||||
|
# Need target since MSYS tools into mozilla-build may be 32bit
|
||||||
|
ac_configure_args="$ac_configure_args CC=\"$_topsrcdir/js/ctypes/libffi/msvcc.sh -m64\" --build=$build --host=$target"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
ac_configure_args="$ac_configure_args CC=$_topsrcdir/js/ctypes/libffi/msvcc.sh"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
if test "$SOLARIS_SUNPRO_CC"; then
|
if test "$SOLARIS_SUNPRO_CC"; then
|
||||||
# Always use gcc for libffi on Solaris
|
# Always use gcc for libffi on Solaris
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
|
|
||||||
# Disable specific warnings, and enable warnings-as-errors so we catch any
|
# Disable specific warnings, and enable warnings-as-errors so we catch any
|
||||||
# mistranslated args.
|
# mistranslated args.
|
||||||
nowarn="-wd4127 -wd4820 -wd4706 -wd4100 -wd4255 -wd4668 -wd4053 -wd4324"
|
nowarn="-wd4127 -wd4820 -wd4706 -wd4100 -wd4255 -wd4668 -wd4053 -wd4324 -wd4267 -wd4054"
|
||||||
args="-nologo -W3 -WX $nowarn"
|
args="-nologo -W3 -WX $nowarn"
|
||||||
md=-MD
|
md=-MD
|
||||||
cl="cl"
|
cl="cl"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче