Commit 8ea8699e authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1736486 - Link bcrypt where needed. r=firefox-build-system-reviewers,andi 

rust 1.57's libstd adds a dependency on bcrypt on Windows.

Differential Revision: https://phabricator.services.mozilla.com/D132110
parent 1cc3caab

js/src/build/moz.build

+12 −0
Original line number Diff line number Diff line
@@ -79,6 +79,18 @@ if CONFIG["OS_ARCH"] == "SunOS": 
        "socket",

    ]



# Version string comparison is generally wrong, but by the time it would

# actually matter, either bug 1489995 would be fixed, or the build would

# require version >= 1.57.

if (

    CONFIG["OS_ARCH"] == "WINNT"

    and CONFIG["RUSTC_VERSION"]

    and CONFIG["RUSTC_VERSION"] >= "1.57.0"

):

    OS_LIBS += [

        "bcrypt",

    ]



if CONFIG["MOZ_NEEDS_LIBATOMIC"]:

    OS_LIBS += ["atomic"]

toolkit/crashreporter/mozwer/moz.build

+8 −0
Original line number Diff line number Diff line
@@ -6,6 +6,14 @@ USE_LIBS += [ 
    "mozwer_s",

]



# Version string comparison is generally wrong, but by the time it would

# actually matter, either bug 1489995 would be fixed, or the build would

# require version >= 1.57.

if CONFIG["RUSTC_VERSION"] and CONFIG["RUSTC_VERSION"] >= "1.57.0":

    OS_LIBS += [

        "bcrypt",

    ]



DEFFILE = "mozwer.def"

USE_STATIC_LIBS = True