Commit 0fd10d96 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1724830 - Only allow --enable-stdcxx-compat when building on or targetting... 

Bug 1724830 - Only allow --enable-stdcxx-compat when building on or targetting Linux. r=firefox-build-system-reviewers,andi

As this means stdc++compat also would need to be built when
cross-building for Windows on Linux, we also recurse in the stdc++compat
directory in that case. It was already possible to use
--enable-stdcxx-compat in that configuration, and that wasn't working
(there are other problems that prevent it from working, but we're going
to fix them shortly).

Differential Revision: https://phabricator.services.mozilla.com/D122195
parent 61812c65

build/moz.build

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ if CONFIG["OS_ARCH"] == "WINNT": 
else:

    DIRS += ["unix"]



if CONFIG["MOZ_LIBSTDCXX_TARGET_VERSION"] or CONFIG["MOZ_LIBSTDCXX_HOST_VERSION"]:

    DIRS += ["unix/stdc++compat"]



CRAMTEST_MANIFESTS += [

    "tests/cram/cram.ini",

]

build/moz.configure/toolchain.configure

+5 −0
Original line number Diff line number Diff line
@@ -2475,6 +2475,11 @@ option( 
    "--enable-stdcxx-compat",

    env="MOZ_STDCXX_COMPAT",

    help="Enable compatibility with older libstdc++",

    when=depends(target, host)(

        lambda target, host: any(

            t.os == "GNU" and t.kernel == "Linux" for t in (target, host)

        )

    ),

)

build/unix/moz.build

+0 −3
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ 
# License, v. 2.0. If a copy of the MPL was not distributed with this

# file, You can obtain one at http://mozilla.org/MPL/2.0/.



if CONFIG["MOZ_LIBSTDCXX_TARGET_VERSION"] or CONFIG["MOZ_LIBSTDCXX_HOST_VERSION"]:

    DIRS += ["stdc++compat"]



if CONFIG["USE_ELF_HACK"]:

    DIRS += ["elfhack"]