зеркало из https://github.com/mozilla/gecko-dev.git
Use gcc-4.2 by default on Mac OS X in all configurations. b=513353 r=ted
This commit is contained in:
Родитель
174a0a1880
Коммит
2019309068
|
@ -182,7 +182,7 @@ then
|
||||||
fi
|
fi
|
||||||
MOZ_BUILD_ROOT=`pwd`
|
MOZ_BUILD_ROOT=`pwd`
|
||||||
|
|
||||||
dnl Default to MSVC for win32
|
dnl Default to MSVC for win32 and gcc-4.2 for darwin
|
||||||
dnl ==============================================================
|
dnl ==============================================================
|
||||||
if test -z "$CROSS_COMPILE"; then
|
if test -z "$CROSS_COMPILE"; then
|
||||||
case "$target" in
|
case "$target" in
|
||||||
|
@ -195,6 +195,10 @@ case "$target" in
|
||||||
if test -z "$AS"; then AS=ml; fi
|
if test -z "$AS"; then AS=ml; fi
|
||||||
if test -z "$MIDL"; then MIDL=midl; fi
|
if test -z "$MIDL"; then MIDL=midl; fi
|
||||||
;;
|
;;
|
||||||
|
*-darwin*)
|
||||||
|
if test -z "$CC"; then CC=gcc-4.2; fi
|
||||||
|
if test -z "$CXX"; then CXX=g++-4.2; fi
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -170,7 +170,7 @@ MOZ_ARG_WITH_STRING(dist-dir,
|
||||||
TOP_DIST=dist)
|
TOP_DIST=dist)
|
||||||
AC_SUBST(TOP_DIST)
|
AC_SUBST(TOP_DIST)
|
||||||
|
|
||||||
dnl Default to MSVC for win32
|
dnl Default to MSVC for win32 and gcc-4.2 for darwin
|
||||||
dnl ==============================================================
|
dnl ==============================================================
|
||||||
if test -z "$CROSS_COMPILE"; then
|
if test -z "$CROSS_COMPILE"; then
|
||||||
case "$target" in
|
case "$target" in
|
||||||
|
@ -181,6 +181,11 @@ case "$target" in
|
||||||
if test -z "$CXXCPP"; then CXXCPP="cl -TP -E -nologo"; ac_cv_prog_CXXCPP="$CXXCPP"; fi
|
if test -z "$CXXCPP"; then CXXCPP="cl -TP -E -nologo"; ac_cv_prog_CXXCPP="$CXXCPP"; fi
|
||||||
if test -z "$LD"; then LD=link; fi
|
if test -z "$LD"; then LD=link; fi
|
||||||
if test -z "$AS"; then AS=ml; fi
|
if test -z "$AS"; then AS=ml; fi
|
||||||
|
if test -z "$MIDL"; then MIDL=midl; fi
|
||||||
|
;;
|
||||||
|
*-darwin*)
|
||||||
|
if test -z "$CC"; then CC=gcc-4.2; fi
|
||||||
|
if test -z "$CXX"; then CXX=g++-4.2; fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
Загрузка…
Ссылка в новой задаче