Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 91300d29898b (bug 1489443) for MinGW build bustages. CLOSED TREE

Browse Source
This commit is contained in:
Cosmin Sabou 2018-10-13 02:17:15 +03:00
parent 696b1680f6
commit 9b6a537ec7
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/autoconf/toolchain.m4
View File

@ -34,6 +34,12 @@ if test "$CC_TYPE" = "clang-cl"; then
CLANG_CL=1
fi
if test "$GNU_CC"; then
if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
GCC_USE_GNU_LD=1
fi
fi
AC_SUBST(CLANG_CXX)
AC_SUBST(CLANG_CL)
])

7
build/moz.configure/toolchain.configure
View File

@ -1818,13 +1818,6 @@ set_config('LD_IS_BFD', depends(select_linker.KIND)
add_old_configure_assignment('LINKER_LDFLAGS', select_linker.LINKER_FLAG)
# GCC_USE_GNU_LD=1 means the linker is command line compatible with GNU ld.
set_config('GCC_USE_GNU_LD', depends(select_linker.KIND)
(lambda x: x in ('bfd', 'gold', 'lld') or None))
add_old_configure_assignment('GCC_USE_GNU_LD', depends(select_linker.KIND)
(lambda x: x in ('bfd', 'gold', 'lld') or None))
# Assembler detection
# ==============================================================

2
js/src/old-configure.in
View File

@ -1770,6 +1770,8 @@ AC_SUBST(HOST_BIN_SUFFIX)
AC_SUBST(TARGET_XPCOM_ABI)
AC_SUBST(GCC_USE_GNU_LD)
AC_SUBST_LIST(DSO_CFLAGS)
AC_SUBST_LIST(DSO_PIC_CFLAGS)
AC_SUBST(DSO_LDOPTS)

1
old-configure.in
View File

@ -4212,6 +4212,7 @@ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3)
AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSE4_1)
AC_SUBST(HAVE_X86_AVX2)
AC_SUBST(HAVE_ALTIVEC)
AC_SUBST(GCC_USE_GNU_LD)
AC_SUBST_LIST(DSO_CFLAGS)
AC_SUBST_LIST(DSO_PIC_CFLAGS)

2
python/mozbuild/mozbuild/action/generate_symbols_file.py
View File

@ -71,7 +71,7 @@ def generate_symbols_file(output, *args):
assert ext == '.def'
output.write('LIBRARY %s\nEXPORTS\n %s\n'
% (libname, '\n '.join(symbols)))
elif buildconfig.substs.get('GCC_USE_GNU_LD'):
elif buildconfig.substs['GCC_USE_GNU_LD']:
# A linker version script is generated for GNU LD that looks like the
# following:
# liblibrary.so {

3
security/generate_mapfile.py
View File

@ -22,8 +22,7 @@ import buildconfig
def main(output, input):
is_darwin = buildconfig.substs['OS_ARCH'] == 'Darwin'
is_mingw = "WINNT" == buildconfig.substs['OS_ARCH'] and \
buildconfig.substs.get('GCC_USE_GNU_LD')
is_mingw = "WINNT" == buildconfig.substs['OS_ARCH'] and buildconfig.substs['GCC_USE_GNU_LD']
with open(input, 'rb') as f:
for line in f: