nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1618752 - Fix the Windows cross builds so they include MSVC runtime DLLs. r=froydnj

Browse source 
One part is fixing old-configure.in to use `pwd` when `pwd -W` doesn't work
(it errors on Linux), and another part is supporting two additional
system calls in liblowercase:
- chdir used in the same commands as the `pwd -W` fix
- symlink, used by the install manifest processor to create symbolic
links of those DLLs in $MOZ_OBJDIR/dist/bin.

Differential Revision: https://phabricator.services.mozilla.com/D64707

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2020-02-28 12:33:36 +00:00
parent 29c4b97622
commit 8041004164
2 changed files with 6 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
build/liblowercase/lib.rs
View file

@ -243,4 +243,8 @@ wrappers! {
fn access(path: *const c_char, mode: c_int) -> c_int; fn access(path: *const c_char, mode: c_int) -> c_int;
fn mkdir(path: *const c_char, mode: libc::mode_t) -> c_int; fn mkdir(path: *const c_char, mode: libc::mode_t) -> c_int;
fn chdir(path: *const c_char) -> c_int;
fn symlink(target: *const c_char, linkpath: *const c_char) -> c_int;
} }

4
old-configure.in
View file

@ -169,7 +169,7 @@ case "$target" in
if test ! -d "$WIN_UCRT_REDIST_DIR"; then if test ! -d "$WIN_UCRT_REDIST_DIR"; then
AC_MSG_ERROR([Invalid Windows UCRT Redist directory: ${WIN_UCRT_REDIST_DIR}]) AC_MSG_ERROR([Invalid Windows UCRT Redist directory: ${WIN_UCRT_REDIST_DIR}])
fi fi
WIN_UCRT_REDIST_DIR=`cd "$WIN_UCRT_REDIST_DIR" && pwd -W` WIN_UCRT_REDIST_DIR=`cd "$WIN_UCRT_REDIST_DIR" && (pwd -W 2>/dev/null || pwd)`
fi fi
AC_SUBST(MSVC_C_RUNTIME_DLL) AC_SUBST(MSVC_C_RUNTIME_DLL)
@ -181,7 +181,7 @@ case "$target" in
if test ! -d "$WIN32_REDIST_DIR"; then if test ! -d "$WIN32_REDIST_DIR"; then
AC_MSG_ERROR([Invalid Win32 Redist directory: ${WIN32_REDIST_DIR}]) AC_MSG_ERROR([Invalid Win32 Redist directory: ${WIN32_REDIST_DIR}])
fi fi
WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd -W` WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && (pwd -W 2>/dev/null || pwd)`
fi fi
# Check linker version, except in lld builds # Check linker version, except in lld builds