Commit f60deed0 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1773223 - Filter-out _FORTIFY_SOURCE in GN processing.... 

Bug 1773223 - Filter-out _FORTIFY_SOURCE in GN processing. r=firefox-build-system-reviewers,andi a=RyanVM

This is redundant with the build system setting it in
toolchain.configure.

Differential Revision: https://phabricator.services.mozilla.com/D149471
parent 86e03dfc

python/mozbuild/mozbuild/gn_processor.py

+3 −1
Original line number Diff line number Diff line
@@ -206,7 +206,9 @@ def filter_gn_config(path, gn_result, sandbox_vars, input_vars, gn_target): 
                spec[spec_attr] = [

                    d

                    for d in spec[spec_attr]

                    if "CR_XCODE_VERSION" not in d and "CR_SYSROOT_HASH" not in d

                    if "CR_XCODE_VERSION" not in d

                    and "CR_SYSROOT_HASH" not in d

                    and "_FORTIFY_SOURCE" not in d

                ]

            if spec_attr == "include_dirs":

                spec[spec_attr] = [d for d in spec[spec_attr] if gen_path != Path(d)]

third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build

+0 −16
Original line number Diff line number Diff line
@@ -145,22 +145,6 @@ if CONFIG["CPU_ARCH"] == "arm": 
        "unwind"

    ]



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":



    DEFINES["_DEBUG"] = True

third_party/libwebrtc/api/array_view_gn/moz.build

+0 −16
Original line number Diff line number Diff line
@@ -133,22 +133,6 @@ if CONFIG["CPU_ARCH"] == "arm": 
        "unwind"

    ]



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":



    DEFINES["_DEBUG"] = True

third_party/libwebrtc/api/audio/aec3_config_gn/moz.build

+0 −16
Original line number Diff line number Diff line
@@ -145,22 +145,6 @@ if CONFIG["CPU_ARCH"] == "arm": 
        "unwind"

    ]



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":



    DEFINES["_DEBUG"] = True

third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build

+0 −16
Original line number Diff line number Diff line
@@ -153,22 +153,6 @@ if CONFIG["CPU_ARCH"] == "arm": 
        "unwind"

    ]



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":



    DEFINES["_FORTIFY_SOURCE"] = "2"



if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":



    DEFINES["_DEBUG"] = True