mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-23 21:01:08 +00:00
Backed out 2 changesets (bug 1752064, bug 1752072) for causing build bustages on Windows 2012 CLOSED TREE
Backed out changeset 0cbd0cf9563e (bug 1752072) Backed out changeset b6e0d43b43ab (bug 1752064)
This commit is contained in:
parent
d8fa0d643f
commit
5eb2cfda19
@ -79,6 +79,8 @@ esac
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
|
||||
AC_CHECK_PROGS(RANLIB, "${TOOLCHAIN_PREFIX}ranlib", :)
|
||||
AC_CHECK_PROGS(AS, "${TOOLCHAIN_PREFIX}as", :)
|
||||
AC_CHECK_PROGS(LIPO, "${TOOLCHAIN_PREFIX}lipo", :)
|
||||
AC_CHECK_PROGS(OTOOL, "${TOOLCHAIN_PREFIX}otool", :)
|
||||
AC_CHECK_PROGS(INSTALL_NAME_TOOL, "${TOOLCHAIN_PREFIX}install_name_tool", :)
|
||||
|
@ -2415,7 +2415,9 @@ def as_with_flags(as_info, assembler, provided_assembler, c_compiler):
|
||||
return c_compiler.wrapper + [assembler] + c_compiler.flags
|
||||
|
||||
|
||||
set_config("AS", as_with_flags)
|
||||
add_old_configure_assignment("AS", as_with_flags)
|
||||
add_old_configure_assignment("ac_cv_prog_AS", as_with_flags)
|
||||
add_old_configure_assignment("ac_cv_path_AS", as_with_flags)
|
||||
|
||||
|
||||
@depends(assembler, c_compiler, extra_toolchain_flags)
|
||||
|
@ -91,6 +91,7 @@ if test "$target" != "$host"; then
|
||||
else
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
MOZ_PATH_PROGS(AS, $AS as, $CC)
|
||||
fi
|
||||
|
||||
MOZ_TOOL_VARIABLES
|
||||
|
@ -52,6 +52,7 @@ def old_js_configure_env(substs, mozconfig):
|
||||
for var in (
|
||||
"MOZ_DEV_EDITION",
|
||||
"STLPORT_LIBS",
|
||||
"RANLIB",
|
||||
):
|
||||
if var in substs:
|
||||
value = substs[var]
|
||||
|
@ -82,6 +82,7 @@ else
|
||||
sleep 2
|
||||
esac
|
||||
AC_PROG_CXX
|
||||
MOZ_PATH_PROGS(AS, $AS as, $CC)
|
||||
AC_CHECK_PROGS(OTOOL, otool, :)
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user