Commit 9ea3f97b authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1747500 - Move MOZ_LINKER to python configure. r=firefox-build-system-reviewers,mhentges 

Differential Revision: https://phabricator.services.mozilla.com/D134642
parent eac8ebc4

js/src/js-config.mozbuild

+0 −4
Original line number Diff line number Diff line
@@ -20,7 +20,3 @@ if CONFIG['JS_HAS_CTYPES']: 
    DEFINES['JS_HAS_CTYPES'] = True

    if not CONFIG['MOZ_SYSTEM_FFI']:

        DEFINES['FFI_BUILDING'] = True
 


# Forward MOZ_LINKER config

if CONFIG['MOZ_LINKER']:

    DEFINES['MOZ_LINKER'] = True

js/src/old-configure.in

+0 −1
Original line number Diff line number Diff line
@@ -1228,7 +1228,6 @@ AC_SUBST(TARGET_XPCOM_ABI) 
AC_SUBST(DSO_LDOPTS)

AC_SUBST(BIN_SUFFIX)

AC_SUBST(USE_N32)

AC_SUBST(MOZ_LINKER)

AC_SUBST(WIN32_CONSOLE_EXE_LDFLAGS)

AC_SUBST(WIN32_GUI_EXE_LDFLAGS)

js/sub.configure

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ def old_js_configure_env(substs, mozconfig): 
    for var in (

        "MOZ_DEV_EDITION",

        "STLPORT_LIBS",

        "MOZ_LINKER",

        "ZLIB_IN_MOZGLUE",

        "RANLIB",

    ):

old-configure.in

+0 −9
Original line number Diff line number Diff line
@@ -423,10 +423,6 @@ case "$target" in 
    ;;



*-android*|*-linuxandroid*)

    if test "$COMPILE_ENVIRONMENT" -a -n "$MOZ_MEMORY"; then

        MOZ_LINKER=1

    fi



    if test -z "$CLANG_CC"; then

        MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions -Os"

    else
@@ -698,11 +694,6 @@ if test -z "$MOZ_OPTIMIZE_FLAGS"; then 
fi





AC_SUBST(MOZ_LINKER)

if test -n "$MOZ_LINKER"; then

  AC_DEFINE(MOZ_LINKER)

fi



if test -z "$COMPILE_ENVIRONMENT"; then

    SKIP_COMPILER_CHECKS=1

    SKIP_LIBRARY_CHECKS=1

toolkit/moz.configure

+16 −0
Original line number Diff line number Diff line
@@ -2968,3 +2968,19 @@ with only_when(compile_environment): 
            check_msg="for pthread_cond_timedwait_monotonic_np",

        ),

    )





# Custom dynamic linker for Android

# ==============================================================

with only_when(target_is_linux & compile_environment):

    option(

        env="MOZ_LINKER",

        default=depends(target.os, when="--enable-jemalloc")(

            lambda os: os == "Android"

        ),

        help="{Enable|Disable} custom dynamic linker",

    )



    set_config("MOZ_LINKER", True, when="MOZ_LINKER")

    set_define("MOZ_LINKER", True, when="MOZ_LINKER")

    add_old_configure_assignment("MOZ_LINKER", True, when="MOZ_LINKER")